--- YodaProfiler/src/GLTables.cpp	2007/01/31 16:15:02	1.22
+++ YodaProfiler/src/GLTables.cpp	2007/03/23 08:17:26	1.25
@@ -1170,7 +1170,8 @@
   // ----------------
   myquery.str("");
   myquery << "select ID,ID_ROOT_L0,EV_ROOT_CALIBTRK1,EV_ROOT_CALIBTRK2,FROM_TIME,TO_TIME,OBT1,OBT2,PKT1,PKT2,BOOT_NUMBER,VALIDATION from GL_TRK_CALIB where FROM_TIME <= "<< time;
-  myquery << " AND VALIDATION=1 ORDER BY FROM_TIME DESC LIMIT 1;";      
+//  myquery << " AND VALIDATION=1 ORDER BY FROM_TIME DESC LIMIT 1;";      // RIVEDERE LA VALIDAZIONE!!!
+  myquery << " ORDER BY FROM_TIME DESC LIMIT 1;";      
   //  myquery << " ORDER BY FROM_TIME DESC LIMIT 1;";      
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return -57;  
   this->GetGLTABLES()->AddQ();
@@ -1338,7 +1339,7 @@
   // ----------------    
   myquery.str("");
   myquery << " select ";
-  myquery << " ID, PATH, NAME, DESCR, TYPE, FROM_TIME,TO_TIME ";
+  myquery << " ID, PATH, NAME, DESCR, FROM_TIME,TO_TIME, TYPE ";
   myquery << " from GL_PARAM ";
   myquery << " where TYPE = '"<<type<<"' ";
   myquery << " and FROM_TIME <= " << time; 
@@ -1399,6 +1400,9 @@
   TSQLRow *Row;
   stringstream myquery;
   stringstream rname;
+  //  pcksList packetsNames;
+  //  pcksList::iterator Iter;
+  //  getPacketsNames(packetsNames);
   rname.str("");
   // ----------------
   myquery.str("");
@@ -1434,6 +1438,27 @@
     ph = eh->GetPscuHeader();
     pktfirst = ph->GetCounter();
     obtfirst = ph->GetOrbitalTime();  
+    //
+//     code = eh->GetCounter();
+//     UInt_t en = 0;
+//     for(Iter = packetsNames.begin(); Iter != packetsNames.end(); Iter++){
+//       en = code->Get(GetPacketType(*Iter));
+//       if ( !strcmp("CalibCalPed",*Iter) || !strcmp("CalibTrk1",*Iter) || !strcmp("CalibTrk2",*Iter) || !strcmp("CalibS4",*Iter) ){
+// 	//
+// 	TTree *TC = 0;
+// 	TC = (TTree*)file->Get("CalibCalPed");
+// 	if ( !TC || TC->IsZombie() ) return;
+// 	EventHeader *ehc = 0;
+// 	PscuHeader *phc = 0;
+// 	TC->SetBranchAddress("Header", &ehc);
+// 	TC->GetEntry(0);
+// 	phc = ehc->GetPscuHeader();
+// 	pktfirst = phc->GetCounter();
+// 	obtfirst = phc->GetOrbitalTime();  
+//       //
+//       };
+//     };  
+    //
   };
   //
   // look for Resurs offset
@@ -1465,9 +1490,14 @@
     for (Int_t i = 8; i<13; i++){
       dwo.Append(name[i],1);
     };     
-    if ( dwo.IsDigit() ) dworbit = (UInt_t)dwo.Atoi();
+    if ( dwo.IsDigit() ){
+      dworbit = (UInt_t)dwo.Atoi();
+    } else {
+      dworbit = 1;
+    };
   };
   //
+  //
   if ( !Row ){
     oss.str("");
     oss << "SELECT YEAR(OFFSET_DATE),MONTH(OFFSET_DATE),DAY(OFFSET_DATE),HOUR(OFFSET_DATE),MINUTE(OFFSET_DATE),SECOND(OFFSET_DATE) FROM GL_RESURS_OFFSET WHERE FROM_ORBIT< "