--- chewbacca/YodaProfiler/inc/PamelaDBOperations.h	2008/10/31 11:21:42	1.3
+++ chewbacca/YodaProfiler/inc/PamelaDBOperations.h	2009/12/28 08:39:23	1.8
@@ -91,21 +91,27 @@
 	
     // flag to control profiler actions
     Bool_t STATIC;
+    Bool_t KEEPENV;
     Bool_t INSERT_RAW;
     Bool_t INSERT_ROOT;
     Bool_t VALIDATE;
     Bool_t NOFRAG;
     Bool_t AUTOBOOT;
     Bool_t PEDANTIC;
+    Bool_t RELAXED;
 
     // flags and variables for chewbacca
     Bool_t chewbacca;
     UInt_t chID;
     //
+    TString tag;
+    TString chiby;
+    //
     UInt_t chpktinit;
     UInt_t chpktfinal;
     UInt_t chobtinit;
     UInt_t chobtfinal;
+    UInt_t chrtinit;
     Int_t nrhbef;
     Int_t nrhaf;
     Int_t nrtbef;
@@ -189,14 +195,15 @@
     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);
     //
@@ -210,7 +217,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
     //
@@ -236,8 +243,11 @@
     void SetNoFrag(Bool_t nf);
     void SetAutoBoot(Bool_t nf);
     void SetPedantic(Bool_t pd);
+    void SetRelaxed(Bool_t pd){ if ( pd ) printf(" WARNING: USING RELAXED CONDITIONS, ARE YOU SURE ON WHAT YOU'RE DOING? \n"); RELAXED=pd;};
     void SetPhysEndRunVariables();
     //
+    void SetTag(TString ntag){tag=ntag;};
+    //
     Bool_t SetID_RAW();
     //
     Int_t SetUpperLimits();
@@ -258,7 +268,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();
@@ -285,8 +295,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();
@@ -295,6 +307,8 @@
     void LockTables();
     void UnLockTables();
     //
+    void NotChewbacca(UInt_t boot, UInt_t tsync, UInt_t obt0, Bool_t gpamela);
+    //
 	
     Bool_t NoFrag(){return(NOFRAG);};
     Bool_t InsertRoot(){return(INSERT_ROOT);};