--- chewbacca/YodaProfiler/src/PamelaDBOperations.cpp	2008/11/28 09:10:16	1.11
+++ chewbacca/YodaProfiler/src/PamelaDBOperations.cpp	2008/11/28 10:57:44	1.12
@@ -6082,7 +6082,8 @@
     // 2) get the OBT of the last validated run
     // --------------------------------------------------------------
     oss.str("");
-    oss << " SELECT * FROM GL_RUN  WHERE VALIDATION=1 AND RUNHEADER_TIME<="<< t_start
+    //    oss << " SELECT * FROM GL_RUN  WHERE VALIDATION=1 AND RUNHEADER_TIME<="<< t_start
+    oss << " SELECT * FROM GL_RUN  WHERE VALIDATION>0 AND RUNHEADER_TIME<="<< t_start
 	<<" ORDER BY RUNHEADER_TIME DESC LIMIT 1;";
     if ( IsDebug() ) printf(" Get stop validation-time: query is \n %s \n",oss.str().c_str());
     result = conn->Query(oss.str().c_str());
@@ -6225,7 +6226,8 @@
 	if( interval >= calibtime )CHECK = true;			//more than calibtime s => there might be a calibration
 			  
 	if( !CHECK && this_run->VALIDATION ){
-	  for (Int_t irun = 0; irun < nseq; irun++)assignVALIDATION(sequence[irun],true);
+	  //	  for (Int_t irun = 0; irun < nseq; irun++)assignVALIDATION(sequence[irun],true);
+	  for (Int_t irun = 0; irun < nseq; irun++)assignVALIDATION(sequence[irun],this_run->VALIDATION);
 	  nseq=0;
 	}
 		  
@@ -6246,8 +6248,13 @@
     if( CHECK ){
       // check if calibration exists
       if ( IsDebug() )printf("DT %i ===> CHECK Missing calibration\n",interval); 
-      Bool_t MISSING = MissingTRK_CALIB(t1,t2);
-      for (Int_t irun = 0; irun < nseq; irun++)assignVALIDATION(sequence[irun],!MISSING);
+      //      Bool_t MISSING = MissingTRK_CALIB(t1,t2);
+      UInt_t MISSING = MissingTRK_CALIB(t1,t2);
+      UInt_t val = 0;
+      if ( MISSING == 1 ) val = 0;
+      if ( MISSING == 0 ) val = 1;
+      if ( MISSING == 2 ) val = 2;
+      for (Int_t irun = 0; irun < nseq; irun++)assignVALIDATION(sequence[irun],val);
       nseq=0;
     };
     //--------------
@@ -6277,14 +6284,17 @@
  * @param t2 To absolute time
  * @return true if there might be a missing calibration
  */
-Bool_t PamelaDBOperations::MissingTRK_CALIB(UInt_t t1,UInt_t t2){
+//Bool_t PamelaDBOperations::MissingTRK_CALIB(UInt_t t1,UInt_t t2){
+UInt_t PamelaDBOperations::MissingTRK_CALIB(UInt_t t1,UInt_t t2){
 	
   GL_TRK_CALIB* trkcalib = new GL_TRK_CALIB();
 	
   // get the closest calibration before the run start (t2)
-  if ( trkcalib->Query_GL_TRK_CALIB(t2, conn) )return(true); 	//>>> missing
+  //  if ( trkcalib->Query_GL_TRK_CALIB(t2, conn) )return(true); 	//>>> missing
+  if ( trkcalib->Query_GL_TRK_CALIB(t2, conn) )return(1); 	//>>> missing
 	
-  if ( trkcalib->TO_TIME  < t2 ) return(true); 					//>>> missing
+  //  if ( trkcalib->TO_TIME  < t2 ) return(true); 					//>>> missing
+  if ( trkcalib->TO_TIME  < t2 ) return(1); 					//>>> missing
 	
   //==============================================================
   // Check is done first on the basis of time between calibration,
@@ -6301,9 +6311,11 @@
     //==============================================================
     Bool_t DOWNLOAD = false;
     // check if the calib was skipped becouse of download .... DA FARE!! 
-    if(DOWNLOAD)return(false);
+    //    if(DOWNLOAD)return(false);
+    if(DOWNLOAD)return(0);
 		
-    return(true); 					//>>> missing
+    //    return(true); 					//>>> missing
+    return(1); 					//>>> missing
 		
   };
 	
@@ -6313,7 +6325,9 @@
   //==============================================================
   // the long time interval bewteen runs might be due to download
   if ( IsDebug() )printf("Short time between calib and run start %u :-) ==> OK! \n",t2 - trkcalib->FROM_TIME);
-  return(false);
+  if ( trkcalib->VALIDATION ) return(0);
+  if ( IsDebug() )printf("Calibration is not validated... :-/ ==> OK but with VALIDATION=2! \n");
+  return(2);
 	
 };
 /**
@@ -6322,6 +6336,10 @@
  * @param validation true/false
  */
 Int_t PamelaDBOperations::assignVALIDATION(UInt_t idrun, Bool_t validation){
+  return(this->assignVALIDATION(idrun,(UInt_t)validation));
+}
+
+Int_t PamelaDBOperations::assignVALIDATION(UInt_t idrun, UInt_t validation){
   TSQLResult *result = 0;
   stringstream oss;
   oss.str("");