From 1c13a3a0af41c8a8a0069dc356daa2f27e57d3cf Mon Sep 17 00:00:00 2001 From: fprino Date: Fri, 23 Nov 2012 08:28:05 +0000 Subject: [PATCH] Minor changes in macros to check SDD calibration --- ITS/macrosSDD/PlotCalibSDDVsTime.C | 1 + ITS/macrosSDD/ShowCalibrationSDD.C | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ITS/macrosSDD/PlotCalibSDDVsTime.C b/ITS/macrosSDD/PlotCalibSDDVsTime.C index 3c1d0234cda..8362eb14b2f 100644 --- 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(nrunlastRun) continue; sprintf(filnamalien,"alien://%s",filnam); diff --git a/ITS/macrosSDD/ShowCalibrationSDD.C b/ITS/macrosSDD/ShowCalibrationSDD.C index 7fd15d3c692..d288fa7f00a 100644 --- 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); -- 2.43.0