--- YodaProfiler/src/GLTables.cpp	2007/03/19 16:14:18	1.24
+++ YodaProfiler/src/GLTables.cpp	2007/04/30 09:19:39	1.29
@@ -1145,7 +1145,7 @@
 	  if(t==0) ID     = (UInt_t)atoll(Row->GetField(t));
 	  if(t==1) ID_RAW = (UInt_t)atoll(Row->GetField(t));
 	  if(t==2) ID_TIMESYNC = (UInt_t)atoll(Row->GetField(t));
-	  if(t==3) PATH   = Row->GetField(t);
+	  if(t==3) PATH   = (TString)gSystem->ExpandPathName(Row->GetField(t))+'/';
 	  if(t==4) NAME   = Row->GetField(t);
       };
   };
@@ -1171,6 +1171,7 @@
   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;";      // RIVEDERE LA VALIDAZIONE!!!
+  myquery << " and EV_ROOT_CALIBTRK1>=0 and EV_ROOT_CALIBTRK2>=0 "; // EM! SE MANCA UN PACCHETTO DEI DUE IL PROCESSAMENTO CRASHA... DA 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;  
@@ -1339,7 +1340,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; 
@@ -1354,7 +1355,7 @@
       if( Row == NULL ) break;
       for( t = 0; t < pResult->GetFieldCount(); t++){ 
 	if (t==0) ID        = (UInt_t)atoll(Row->GetField(t));
-	  if (t==1) PATH      = Row->GetField(t);// put in fpath the path to that file
+	if (t==1) PATH      = (TString)gSystem->ExpandPathName(Row->GetField(t))+'/';// put in fpath the path to that file
 	  if (t==2) NAME      = Row->GetField(t);
 	  if (t==3) DESCR     = Row->GetField(t);
 	  if (t==4) FROM_TIME = (UInt_t)atoll(Row->GetField(t));
@@ -1421,7 +1422,7 @@
     if( Row ){
       stringstream fname;
       fname.str("");
-      fname << Row->GetField(0) << "/" << Row->GetField(1);
+      fname << gSystem->ExpandPathName(Row->GetField(0)) << "/" << Row->GetField(1);
       rname << Row->GetField(1);
       file = new TFile(fname.str().c_str(),"READ");
       idraw = (UInt_t)atoll(Row->GetField(2));
@@ -1467,9 +1468,11 @@
   //
   //
   stringstream oss;
+  TString frn = rname.str().c_str();
+  frn = frn.ReplaceAll(".root",5,".pam",4);
   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 SPECIAL_FILE='" 
-      << rname.str().c_str() << "';";
+      << frn.Data() << "';";
   if ( !this->GetGLTABLES()->IsConnected(dbc) ) return;  
   this->GetGLTABLES()->AddQ();
   pResult = dbc->Query(oss.str().c_str());