Minor changes in macros to check SDD calibration

diff --git a/ITS/macrosSDD/PlotCalibSDDVsTime.C b/ITS/macrosSDD/PlotCalibSDDVsTime.C
index 3c1d0234cdad2dcd221ccacd2f734812418848e2..8362eb14b2f02f24e8773cee0a41fae3a2dee3d2 100644 (file)
--- a/ITS/macrosSDD/PlotCalibSDDVsTime.C
+++ b/ITS/macrosSDD/PlotCalibSDDVsTime.C
@@ -84,6 +84,7 @@ void PlotCalibSDDVsTime(Int_t year=2012, Int_t firstRun=172600,
     if(year==2009 && (nrun>100000 && nv< 184)) continue; // protection for files with swapped ladder 0-1 of layer 4
     if(year==2010 && (nrun>=114603 && nv< 98)) continue; // protection for files without treatment of masked hybrids 
     if(year==2011 && (nrun>=145349 && nrun<=148978) && nrun2> 148978) continue; // protection for files affected by problem in second DA
+    if(year==2011 && nrun==156856) continue;
     if(nrun<firstRun) continue;
     if(nrun>lastRun) continue;
     sprintf(filnamalien,"alien://%s",filnam);

diff --git a/ITS/macrosSDD/ShowCalibrationSDD.C b/ITS/macrosSDD/ShowCalibrationSDD.C
index 7fd15d3c692886daac31e3056f5f91f1258b7f6d..d288fa7f00a84f64156768a7d33b30b60ca899b9 100644 (file)
--- a/ITS/macrosSDD/ShowCalibrationSDD.C
+++ b/ITS/macrosSDD/ShowCalibrationSDD.C
@@ -505,12 +505,19 @@ void ShowCalibrationSDD(Int_t nrun, Int_t year=2012, Int_t nmod=0){
   gSystem->Exec(cmd.Data());
   Char_t filnam[200],filnamalien[200];
   FILE* runtxt=fopen("run.txt","r");
-  fscanf(runtxt,"%s\n",filnam);    
-  if(!strstr(filnam,"/alice/data/")){
+  Bool_t found=kFALSE;
+  while(!feof(runtxt)){
+    fscanf(runtxt,"%s\n",filnam);    
+    if(strstr(filnam,"/alice/data/")){
+      found=kTRUE;
+      break;
+    }  
+  }
+  if(!found){
     printf("Bad run number\n");
-    gSystem->Exec("rm run.txt");
+    //    gSystem->Exec("rm run.txt");
     return;
-  }  
+  }
   sprintf(filnamalien,"alien://%s",filnam);
   
   printf("Open file: %s\n",filnamalien);