--- chewbacca/YodaProfiler/src/PamelaDBOperations.cpp	2008/11/04 10:48:38	1.6
+++ chewbacca/YodaProfiler/src/PamelaDBOperations.cpp	2008/11/04 13:19:36	1.7
@@ -4892,20 +4892,22 @@
 		//
 	    };
 	    //
+
+	    if( !(MISSING_pkt1&MISSING_pkt2) ){
+	      this->HandleTRK_CALIB(!MISSING_pkt1,!MISSING_pkt2); 
+	      ncalib++;
+	      if( MISSING_pkt1||MISSING_pkt2||!valid )try_to_recover=true;
+	    }
+
+
 	} else {
-	    //
+	  //
 	    if ( IsDebug() ) printf(" Trk calibration1 at time %u obt %u pkt %u OUTSIDE the considered time interval \n",fromtime,obt1,pkt1);
 	    //      if ( PEDANTIC ) throw -79;
 	    //
 	};
 	//    
 
-	if( !(MISSING_pkt1&MISSING_pkt2) ){
-	    this->HandleTRK_CALIB(!MISSING_pkt1,!MISSING_pkt2); 
-	    ncalib++;
-	    if( MISSING_pkt1||MISSING_pkt2||!valid )try_to_recover=true;
-	}
-
     }; //end loop on pkt1
 
 
@@ -5130,7 +5132,8 @@
 		    // ------------------------------------------------------
 		    // ... retrieve the calibration packets.
 		    // ------------------------------------------------------
-		    TFile *file = new TFile((TString)gSystem->ExpandPathName(path)+"/"+name); // EM, path could be symbolic and we must expand it
+		    if ( IsDebug() ) printf(" file is %s/%s \n",((TString)gSystem->ExpandPathName(path.Data())).Data(),name.Data());
+		    TFile *file = new TFile(((TString)gSystem->ExpandPathName(path.Data()))+"/"+name); // EM, path could be symbolic and we must expand it
 		    if(!file)throw -100;
 		    if(file->IsZombie())throw -100;
 		    //