Minor updates in macros to check the SDD calibration files (F. Prino)

diff --git a/ITS/ShowCalibrationSDD.C b/ITS/ShowCalibrationSDD.C
index e22c1e6a93b863dbe54254b95620607218fb96e3..854317be962e0643275b256654edca2c40aa5ea1 100644 (file)
--- a/ITS/ShowCalibrationSDD.C
+++ b/ITS/ShowCalibrationSDD.C
@@ -82,7 +82,7 @@ void ShowCalibrationSDD(Int_t iMod=0, Char_t *filnam="$ALICE_ROOT/ITS/Calib/Cali
       Float_t noise=cal->GetNoiseAfterElectronics(iAn);
       Float_t gain=cal->GetChannelGain(iAn);
       if(cal->IsBadChannel(iAn)) hchstatus->Fill(0);
-      if(!cal->IsBadChannel(iAn)){
+      if(!cal->IsBadChannel(iAn) && !cal->IsChipBad(ic) && !cal->IsBad() ){
        hbase->Fill(base);
        hchstatus->Fill(1);
        hnoise->Fill(noise);
@@ -210,10 +210,10 @@ void ShowCalibrationSDD(Int_t iMod=0, Char_t *filnam="$ALICE_ROOT/ITS/Calib/Cali
   gbad->GetYaxis()->SetTitle("Anode Status (1=OK, 0=bad)");
 }
 
-void ShowCalibrationSDD(Int_t nrun, Int_t nv, Char_t* dir="LHC08d", Int_t nmod=0){
+void ShowCalibrationSDD(Int_t nrun, Int_t nv, Int_t year=2009, Int_t nmod=0){
   TGrid::Connect("alien:",0,0,"t");
   Char_t filnam[200];
-  sprintf(filnam,"alien:///alice/data/2008/%s/OCDB/ITS/Calib/CalibSDD/Run%d_999999999_v%d_s0.root",dir,nrun,nv);
+  sprintf(filnam,"alien:///alice/data/%d/OCDB/ITS/Calib/CalibSDD/Run%d_999999999_v%d_s0.root",year,nrun,nv);
   printf("Open file: %s\n",filnam);
   ShowCalibrationSDD(nmod,filnam);
 }

diff --git a/ITS/ShowDriftSpeedSDD.C b/ITS/ShowDriftSpeedSDD.C
index 63e09562d08b32c7a66c78a3ced081c4942183d5..995fe9ab31cdf5fdd37f87bbc97741ec6275a717 100644 (file)
--- a/ITS/ShowDriftSpeedSDD.C
+++ b/ITS/ShowDriftSpeedSDD.C
@@ -36,6 +36,7 @@ void ShowDriftSpeedSDD(Char_t filnam[150]="$ALICE_ROOT/ITS/Calib/DriftSpeedSDD/R
   vvsmod1->SetTitle("Drift Speed vs. mod. number");
   Char_t tit[100];
   for(Int_t i=firstmod; i<lastmod; i++){
+    Int_t iMod=i+240;
     c0->Clear();
     c0->Divide(2,1);
     Int_t i0=2*i;
@@ -51,7 +52,7 @@ void ShowDriftSpeedSDD(Char_t filnam[150]="$ALICE_ROOT/ITS/Calib/DriftSpeedSDD/R
     gvdr1[i]->SetMinimum(5.);
     gvdr0[i]->SetMaximum(9.);
     gvdr1[i]->SetMaximum(9.);
-    sprintf(tit,"Mod %d\n",i);
+    sprintf(tit,"Mod %d\n",iMod);
     gvdr0[i]->SetTitle(tit);
     gvdr1[i]->SetTitle(tit);
 
@@ -63,7 +64,7 @@ void ShowDriftSpeedSDD(Char_t filnam[150]="$ALICE_ROOT/ITS/Calib/DriftSpeedSDD/R
       gvdr0[i]->SetPoint(iAn,(Float_t)iAn,vel0);
       gvdr1[i]->SetPoint(iAn,(Float_t)iAn,vel1);
     }
-    printf(" Mod. %d \t v(an 128l)= %f\n",i,vdriftarr0->GetDriftSpeed(0,128));
+    printf(" Mod. %d \t v(an 128l)= %f",iMod,vdriftarr0->GetDriftSpeed(0,128));
     printf("        \t v(an 128r)= %f\n",vdriftarr1->GetDriftSpeed(0,128));
     c0->cd(1);
     gvdr0[i]->Draw("AP");
@@ -79,8 +80,8 @@ void ShowDriftSpeedSDD(Char_t filnam[150]="$ALICE_ROOT/ITS/Calib/DriftSpeedSDD/R
     if(vdriftarr0) vel0=vdriftarr0->GetDriftSpeed(0,128);
     Float_t vel1=0;
     if(vdriftarr1) vel1=vdriftarr1->GetDriftSpeed(0,128);
-    vvsmod0->SetPoint(vvsmod0->GetN(),(Float_t)i,vel0);
-    vvsmod1->SetPoint(vvsmod1->GetN(),(Float_t)i,vel1);
+    vvsmod0->SetPoint(vvsmod0->GetN(),(Float_t)iMod,vel0);
+    vvsmod1->SetPoint(vvsmod1->GetN(),(Float_t)iMod,vel1);
     
     //    getchar();
   }
@@ -106,10 +107,10 @@ void ShowDriftSpeedSDD(Char_t filnam[150]="$ALICE_ROOT/ITS/Calib/DriftSpeedSDD/R
 
 
 
-void ShowDriftSpeedSDD(Int_t nrun, Int_t nv, Char_t* dir="LHC08d"){
+void ShowDriftSpeedSDD(Int_t nrun, Int_t nv, Int_t year=2009){
   TGrid::Connect("alien:",0,0,"t");
   Char_t filnam[200];
-  sprintf(filnam,"alien:///alice/data/2008/%s/OCDB/ITS/Calib/DriftSpeedSDD/Run%d_999999999_v%d_s0.root",dir,nrun,nv);
+  sprintf(filnam,"alien:///alice/data/%d/OCDB/ITS/Calib/DriftSpeedSDD/Run%d_999999999_v%d_s0.root",year,nrun,nv);
   printf("Open file: %s\n",filnam);
   ShowDriftSpeedSDD(filnam,0,260);
 }