From 2420973e4193d5a6e8cff21970353fd7f9387f32 Mon Sep 17 00:00:00 2001
From: prino <prino@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 11 Feb 2010 16:49:06 +0000
Subject: [PATCH] Minor updates in macros for SDD calibration monitoring

---
 ITS/PlotDriftSpeedSDDVsTime.C |  2 +-
 ITS/ShowCalibrationSDD.C      |  2 +-
 ITS/ShowDriftSpeedSDD.C       | 31 ++++++++++++++++++-------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ITS/PlotDriftSpeedSDDVsTime.C b/ITS/PlotDriftSpeedSDDVsTime.C
index f4724acafa1..e142093150e 100644
--- a/ITS/PlotDriftSpeedSDDVsTime.C
+++ b/ITS/PlotDriftSpeedSDDVsTime.C
@@ -59,7 +59,7 @@ void PlotDriftSpeedSDDVsTime(Int_t year=2009, Int_t firstRun=62840,
        sscanf(filnam,"/alice/data/%d/OCDB/ITS/Calib/DriftSpeedSDD/Run%d_%d_v%d_s%d.root",&year,&nrun,&nrun2,&nv,&ns);
 
        if(year==2009 && (nrun<85639 && nrun2> 85639)) continue;// protection for files with swapped ladders 4-5 of layer 3 
-       if(year==2009 && (nrun>100000 && nv< 271)) continue; // protection for files with swapped ladder 0-1 of layer 4
+       if(year==2009 && (nrun>100000 && nv< 325)) continue; // protection for files with swapped ladder 0-1 of layer 4
   
     if(nrun<firstRun) continue;
     if(nrun>lastRun) continue;
diff --git a/ITS/ShowCalibrationSDD.C b/ITS/ShowCalibrationSDD.C
index f283a6b38ff..8d16559710b 100644
--- a/ITS/ShowCalibrationSDD.C
+++ b/ITS/ShowCalibrationSDD.C
@@ -380,7 +380,7 @@ void ShowCalibrationSDD(Char_t *filnam="$ALICE_ROOT/OCDB/ITS/Calib/CalibSDD/Run0
   gbad->GetYaxis()->SetTitle("Anode Status (1=OK, 0=bad)");
 }
 
-void ShowCalibrationSDD(Int_t nrun, Int_t year=2009, Int_t nmod=0){
+void ShowCalibrationSDD(Int_t nrun, Int_t year=2010, Int_t nmod=0){
   TGrid::Connect("alien:",0,0,"t");
   TString cmd=Form("gbbox find \"/alice/data/%d/OCDB/ITS/Calib/CalibSDD\" \"Run%d*.root\" > run.txt",year,nrun);
   gSystem->Exec(cmd.Data());
diff --git a/ITS/ShowDriftSpeedSDD.C b/ITS/ShowDriftSpeedSDD.C
index f25d1f69f75..aee8d8f430a 100644
--- a/ITS/ShowDriftSpeedSDD.C
+++ b/ITS/ShowDriftSpeedSDD.C
@@ -1,4 +1,5 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TF1.h>
 #include <TFile.h>
 #include <TH1F.h>
 #include <TGraph.h>
@@ -11,6 +12,7 @@
 #include <TObjArray.h>
 #include "AliCDBEntry.h"
 #include "AliITSDriftSpeedArraySDD.h"
+#include "AliITSDriftSpeedSDD.h"
 #endif
 
 // Macro to plot the calibration parameters from the OCDB file 
@@ -78,6 +80,8 @@ void ShowDriftSpeedSDD(Char_t filnam[150]="$ALICE_ROOT/ITS/Calib/DriftSpeedSDD/R
   for(Int_t i=firstmod; i<lastmod; i++){
     Int_t iMod=i+240;
     if(!kNoDraw){
+      c0->Clear();
+      c0->Divide(2,1);
     }
     Int_t i0=2*i;
     Int_t i1=1+2*i;
@@ -115,18 +119,19 @@ void ShowDriftSpeedSDD(Char_t filnam[150]="$ALICE_ROOT/ITS/Calib/DriftSpeedSDD/R
 
     printf(" Mod. %d \tStatusLR=%X %X \t v(an 128l)= %f",iMod,vdriftarr0->GetInjectorStatus(),vdriftarr1->GetInjectorStatus(),vdriftarr0->GetDriftSpeed(0,128));
     printf("        \t v(an 128r)= %f  Degree=%d %d\n",vdriftarr1->GetDriftSpeed(0,128),vdrift0->GetDegreeofPoly(),vdrift1->GetDegreeofPoly());
-    c0->Clear();
-    c0->Divide(2,1);
-    c0->cd(1);
-    gvdr0[i]->Draw("AP");
-    gvdr0[i]->GetXaxis()->SetTitle("Anode");
-    gvdr0[i]->GetYaxis()->SetTitle("Vdrift (#mum/ns)");
-    c0->cd(2);
-    gvdr1[i]->Draw("AP");
-    gvdr1[i]->GetXaxis()->SetTitle("Anode");
-    gvdr1[i]->GetYaxis()->SetTitle("Vdrift (#mum/ns)");
-    c0->Update();
-    
+
+    if(!kNoDraw){
+      c0->cd(1);
+      gvdr0[i]->Draw("AP");
+      gvdr0[i]->GetXaxis()->SetTitle("Anode");
+      gvdr0[i]->GetYaxis()->SetTitle("Vdrift (#mum/ns)");
+      c0->cd(2);
+      gvdr1[i]->Draw("AP");
+      gvdr1[i]->GetXaxis()->SetTitle("Anode");
+      gvdr1[i]->GetYaxis()->SetTitle("Vdrift (#mum/ns)");
+      c0->Update();
+    }
+
     Float_t vel0=0;
     Float_t pd0=0;
     if(vdrift0){ 
@@ -246,7 +251,7 @@ void ShowDriftSpeedSDD(Char_t filnam[150]="$ALICE_ROOT/ITS/Calib/DriftSpeedSDD/R
 
 
 
-void ShowDriftSpeedSDD(Int_t nrun, Int_t year=2009){
+void ShowDriftSpeedSDD(Int_t nrun, Int_t year=2010){
   TGrid::Connect("alien:",0,0,"t");
   TString cmd=Form("gbbox find \"/alice/data/%d/OCDB/ITS/Calib/DriftSpeedSDD\" \"Run%d*.root\" > run.txt",year,nrun);
   gSystem->Exec(cmd.Data());
-- 
2.39.3