--- chewbacca/YodaProfiler/inc/PamelaDBOperations.h	2008/09/25 12:13:52	1.2
+++ chewbacca/YodaProfiler/inc/PamelaDBOperations.h	2008/11/28 10:57:43	1.6
@@ -91,6 +91,7 @@
 	
     // flag to control profiler actions
     Bool_t STATIC;
+    Bool_t KEEPENV;
     Bool_t INSERT_RAW;
     Bool_t INSERT_ROOT;
     Bool_t VALIDATE;
@@ -102,6 +103,9 @@
     Bool_t chewbacca;
     UInt_t chID;
     //
+    TString tag;
+    TString chiby;
+    //
     UInt_t chpktinit;
     UInt_t chpktfinal;
     UInt_t chobtinit;
@@ -183,19 +187,21 @@
     void FillClass();
     void FillClass(Bool_t mishead, Bool_t mistrail, Int_t firstev, Int_t lastev);
     void HandleTRK_CALIB(Bool_t pk1, Bool_t pk2);
+    void HandleTRK_CALIB(GL_TRK_CALIB*);
     //
     void RemoveCALIBS();
     void ValidationOFF();
     void ReArrangeRUNS();
     void RemoveRUNS();
-    void RemoveFILES();
+    void RemoveFILES(UInt_t idtsy);
     //
     Bool_t IsDebug(){return(debug);};
     Bool_t IsRunAlreadyInserted();
     Bool_t IsRunConsistent(Bool_t mishead, Bool_t mistrail, UInt_t &firstev, UInt_t &lastev);
     Bool_t AutoBoot(){return(AUTOBOOT);};
     //
-    Bool_t MissingTRK_CALIB(UInt_t t1,UInt_t t2);
+    //    Bool_t MissingTRK_CALIB(UInt_t t1,UInt_t t2);
+    UInt_t MissingTRK_CALIB(UInt_t t1,UInt_t t2);
     //
     Long64_t PKT(UInt_t pkt_num);
     //
@@ -209,7 +215,7 @@
 
  public: 
     //
-    PamelaDBOperations(TString host, TString user, TString password, TString filerawname, TString filerootname, UInt_t boot, UInt_t tsync, UInt_t obt0, Bool_t debug, TString tlefilename,UInt_t dwinput, Bool_t staticp, Bool_t gpamela); // constructor
+    PamelaDBOperations(TString host, TString user, TString password, TString filerawname, TString filerootname, UInt_t boot, UInt_t tsync, UInt_t obt0, Bool_t debug, TString tlefilename,UInt_t dwinput, Bool_t staticp, Bool_t gpamela, Bool_t keepenv); // constructor
     //
     void Close(); // destructor
     //
@@ -237,6 +243,8 @@
     void SetPedantic(Bool_t pd);
     void SetPhysEndRunVariables();
     //
+    void SetTag(TString ntag){tag=ntag;};
+    //
     Bool_t SetID_RAW();
     //
     Int_t SetUpperLimits();
@@ -257,7 +265,7 @@
     //
     TString GetRawFile(){return((TString)gSystem->BaseName(filerawname.Data()));};
     TString GetRootFile(){return((TString)gSystem->BaseName(filerootname.Data()));};
-    TString GetRootName(){return(filerootname);};
+    TString GetRootName(){return((TString)gSystem->ExpandPathName(filerootname.Data()));};
     TString GetRawName(){return(filerawname);};
     TString GetRawPath();
     TString GetRootPath();
@@ -268,7 +276,9 @@
     //
     Int_t assignBOOT_NUMBER();
     Int_t insertPamelaRootFile();
+    Int_t insertPamelaRootFile(GL_ROOT*);
     Int_t insertPamelaRawFile();
+    Int_t insertPamelaRawFile(GL_RAW*);
     Int_t insertPamelaGL_TIMESYNC(); 
     Int_t insertPamelaRUN(); 
     Int_t insertCALO_CALIB(); 
@@ -282,8 +292,10 @@
     Int_t ValidateRuns();
     Int_t ValidateRuns(TString valfile);
     Int_t assignVALIDATION(UInt_t ,Bool_t );
+    Int_t assignVALIDATION(UInt_t ,UInt_t );
     Int_t removeFile(TString rootfilename);
     //
+    Bool_t IsChewbacca(){return chewbacca;};
     //    void OpenFile();
     void CheckValidate(Long64_t olderthan);
     void CheckConnection();
@@ -301,8 +313,11 @@
     // Functions for TLE
     Int_t populateTLE();
 
-    UInt_t ValidateTrkCalib( CalibTrk1Event* calibtrk , EventHeader* h);
-    UInt_t ValidateTrkCalib( CalibTrk2Event* calibtrk , EventHeader* h){return ValidateTrkCalib((CalibTrk1Event*)calibtrk,h); };
+    UInt_t ValidateTrkCalib( CalibTrk1Event* calibtrk , EventHeader* h, TFile* file);
+    UInt_t ValidateTrkCalib( CalibTrk2Event* calibtrk , EventHeader* h, TFile* file){return ValidateTrkCalib((CalibTrk1Event*)calibtrk,h,file); };
+
+    UInt_t ValidateTrkCalib( CalibTrk1Event* calibtrk , EventHeader* h){return ValidateTrkCalib((CalibTrk1Event*)calibtrk,h,file); };
+    UInt_t ValidateTrkCalib( CalibTrk2Event* calibtrk , EventHeader* h){return ValidateTrkCalib((CalibTrk1Event*)calibtrk,h,file); };
 
     UInt_t Check();
     UInt_t Check(UInt_t from, UInt_t to);