--- YodaProfiler/inc/PamelaDBOperations.h	2006/10/20 11:39:31	1.8
+++ YodaProfiler/inc/PamelaDBOperations.h	2007/02/14 10:54:57	1.14
@@ -57,9 +57,11 @@
     UInt_t id;
     UInt_t idroot;
     UInt_t pktfirst;
-    ULong64_t obtfirst;
-    ULong64_t upperobt;
-    UInt_t upperpkt;
+    UInt_t obtfirst;
+    UInt_t ppktfirst;
+    UInt_t pobtfirst;
+    Long64_t upperobt;
+    Long64_t upperpkt;
     UInt_t upperentry;
     Int_t rtev;
     Int_t rhev;
@@ -86,6 +88,8 @@
     Bool_t INSERT_RAW;
     Bool_t INSERT_ROOT;
     Bool_t VALIDATE;
+    Bool_t NOFRAG;
+    Bool_t AUTOBOOT;
     
     TDatime *clean_time;
     
@@ -150,15 +154,22 @@
     void FillClass(Bool_t mishead, Bool_t mistrail, UInt_t firstev, UInt_t lastev);
     void HandleTRK_CALIB(Bool_t pk1, Bool_t pk2);
     //
+    void RemoveCALIBS();
+    void ValidationOFF();
+    void ReArrangeRUNS();
+    void RemoveRUNS();
+    void RemoveFILES();
+    //
     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);
     //
-    UInt_t PKT(UInt_t pkt_num);
+    Long64_t PKT(UInt_t pkt_num);
     //
-    ULong64_t OBT(UInt_t obt);
+    Long64_t OBT(UInt_t obt);
     //
     UInt_t AssignRunID();
 
@@ -168,7 +179,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); // 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); // constructor
     //
     void Close(); // destructor
     //
@@ -188,7 +199,9 @@
     void SetNOBOOT(Bool_t noboot);
     void SetOlderThan(Long64_t oldthan);
     void SetTLEPath(TString str);
-    void SetOrbitNo();
+    void SetOrbitNo(UInt_t dwinput);
+    void SetNoFrag(Bool_t nf);
+    void SetAutoBoot(Bool_t nf);
     //
     Bool_t SetID_RAW();
     //
@@ -214,7 +227,7 @@
     TString GetRootName(){return(filerootname);};
     TString GetRawName(){return(filerawname);};
 	
-	const char*  GetCleanTime(){return clean_time->AsSQLString();};
+    const char*  GetCleanTime(){return clean_time->AsSQLString();};
     //
     // Functions
     //
@@ -227,8 +240,11 @@
     Int_t insertTRK_CALIB(); 
     Int_t insertS4_CALIB(); 
     Int_t CleanGL_RUN_FRAGMENTS();
+    Int_t CleanGL_RUN_FRAGMENTS(TString fcleanfile);
     Int_t ValidateRuns();
+    Int_t ValidateRuns(TString valfile);
     Int_t assignVALIDATION(UInt_t ,Bool_t );
+    Int_t removeFile(TString rootfilename);
     //
     //    void OpenFile();
     void CheckValidate(Long64_t olderthan);
@@ -236,12 +252,18 @@
     void CheckFile();
     //
 	
+    Bool_t NoFrag(){return(NOFRAG);};
     Bool_t InsertRoot(){return(INSERT_ROOT);};
     Bool_t InsertRaw(){return(INSERT_RAW);};
     Bool_t Validate(){return(VALIDATE);};
 
     // 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 Check();
 	
 };
 #endif /* PAMELA_DB_OPERATIONS_H */