--- chewbacca/YodaProfiler/src/PamelaDBOperations.cpp	2008/11/04 17:11:41	1.9
+++ chewbacca/YodaProfiler/src/PamelaDBOperations.cpp	2008/11/07 08:56:13	1.10
@@ -2317,6 +2317,7 @@
 	      //
 	      this->HandleRunFragments(true,true,chminentry,(evbefh)); 
 	      //
+	      // what about pth=ptht-1
 	    };
 	  };
 	  //
@@ -2379,9 +2380,13 @@
 	//	if ( ptt+1 == rtev){  
 	if ( conptt+1 == nrtev ){  
 	  //	if ( conptt+1 == (nrtev+nrtbef )){  
+	  if ( IsDebug() ) printf(" >>>>>>>>>>> %i %u %i %u \n",ptht,rhev,nrtev,conptt); 
 	  ptht++;
 	  if ( ptht < rhev ){
 	    rh->GetEntry(ptht);
+	    //pth++;
+	    //if ( pth < rhev ){
+	    //rh->GetEntry(pth);
 	    phh = ehh->GetPscuHeader();
 	    pkth = phh->GetCounter();
 	    obth = phh->GetOrbitalTime();
@@ -2406,9 +2411,10 @@
 	      if ( IsDebug() ) printf(" Piece of run at the end of the file with NO RUNHEADER! evbeft %u upperentry-1 %u \n",(UInt_t)evbeft,upperentry-1);
 	      //
 	      if ( (ptt-1) < 0 ) throw -15; // should never arrive here!
-	      rt->GetEntry(ptt-1);
+	      //	      rt->GetEntry(ptt-1);
+	      rt->GetEntry(rtev-1);
 	      cod = eht->GetCounter();
-	      tcod = (UInt_t)cod->Get(pctp->Physics);
+	      tcod = (UInt_t)cod->Get(pctp->Physics)+1;
 	      evbefh = TMath::Max(chminentry,tcod);
 	      //	    evbefh = cod->Get(pctp->Physics);
 	      rt->GetEntry(ptt);
@@ -3242,7 +3248,7 @@
       //
     } else {
       //
-      if ( IsDebug() ) printf(" There are no-phyics packets inside the run!\n");
+      if ( IsDebug() ) printf(" There are no-physics packets inside the run!\n");
       //
       // HERE WE MUST HANDLE THAT RUNS AND GO BACK
       //
@@ -3252,6 +3258,8 @@
       UInt_t check = 0;
       UInt_t lastevtemp = lastev;
       UInt_t firstevno = firstev;
+      UInt_t rhchko=0;
+      UInt_t rhchk=0;
       //
       for (UInt_t i=firstev; i<=lastev; i++){
 	//
@@ -3260,9 +3268,15 @@
 	//
 	check = 0;
 	//
+
+	// if we have a runheader set lastev then exit
+	//
 	for(Iter = packetsNames.begin(); Iter != packetsNames.end(); Iter++){
 	  if ( strcmp(*Iter,"Physics") ) check += code->Get(GetPacketType(*Iter));
 	};
+	// check here if we have a runheader
+	rhchko = rhchk;	  
+	rhchk = code->Get(GetPacketType("RunHeader"));	  
 	//
 	if ( checkfirst < check || i == lastev ){
 	  //
@@ -3679,6 +3693,14 @@
 	  //
 	};
 	//
+	if ( i > firstev ){
+	  if ( rhchko != rhchk ){
+	    if ( IsDebug() ) printf("oh oh... we have a runheader! stop here and handle later the remaining piece\n");
+	    lastev = i;
+	    return(false);
+	  };
+	};
+	//
 	if ( check == checklast && i != lastev ){
 	  lastevtemp = i - 1;
 	  i = lastev - 1; 
@@ -6496,7 +6518,7 @@
   stringstream myquery;
   //  
   myquery.str("");
-  myquery << " SELECT ID, ID_RAW FROM GL_ROOT where NAME='"<<remfile.Data() <<"';";
+  myquery << " SELECT ID,ID_RAW,ID_TIMESYNC FROM GL_ROOT where NAME='"<<remfile.Data() <<"';";
   //
   pResult = conn->Query(myquery.str().c_str());
   //
@@ -6512,6 +6534,7 @@
   //
   this->SetID_ROOT((UInt_t)atoll(Row->GetField(0)));
   this->SetID_RAW((UInt_t)atoll(Row->GetField(1)));
+  UInt_t idtsy=(UInt_t)atoll(Row->GetField(2));
   //
   this->ValidationOFF();
   //
@@ -6519,7 +6542,7 @@
   //
   this->RemoveRUNS();
   //
-  this->RemoveFILES();
+  this->RemoveFILES(idtsy);
   //
   this->SetID_ROOT(0);
   this->SetID_RAW(0);
@@ -6739,7 +6762,7 @@
  * Rearrange calibration tables
  *
  **/
-void PamelaDBOperations::RemoveFILES(){
+void PamelaDBOperations::RemoveFILES(UInt_t idtsy){
   stringstream myquery;
   //
   myquery.str("");
@@ -6749,6 +6772,22 @@
   //
   conn->Query(myquery.str().c_str());
   //
+  myquery.str("");
+  myquery << " DELETE FROM GL_ROOT WHERE ID=" <<this->GetID_ROOT() <<";";
+  //
+  if ( IsDebug() ) printf("  query is \n %s \n",myquery.str().c_str());
+  //
+  conn->Query(myquery.str().c_str());  //
+  //
+  if ( !chewbacca ){
+    myquery.str("");
+    myquery << " DELETE FROM GL_TIMESYNC WHERE ID=" << idtsy <<";";
+    //
+    if ( IsDebug() ) printf("  query is \n %s \n",myquery.str().c_str());
+    //
+    conn->Query(myquery.str().c_str());
+  };
+  //
 };
 
 /**