update to monitor macros

diff --git a/TOF/CheckEnabledChannels.C b/TOF/CheckEnabledChannels.C
index f8bdd5859478ccb3a4116047a5475faa7a87567b..09ebe23c812aaa0073d943428aa9f96d26cb47bf 100644 (file)
--- a/TOF/CheckEnabledChannels.C
+++ b/TOF/CheckEnabledChannels.C
@@ -1,3 +1,49 @@
+CheckEnabledChannels(const Char_t *runlist)
+{
+
+  ifstream is(runlist);
+  Char_t buf[4096];
+  Int_t run[1024];
+  Int_t nrun = 0;
+  while(!is.eof()) {
+    is.getline(buf, 4096);
+    if (is.eof()) break;
+    run[nrun] = atoi(buf);
+    printf("added run number %d\n", run[nrun]);
+    nrun++;
+  }
+  printf("%d runs added\n", nrun);
+  is.close();
+
+  TH1F *hActive = new TH1F("hActive", "active channels;run;fraction", nrun, 0, nrun);
+  TH1F *hReadout = new TH1F("hReadout", "good readout;run;fraction", nrun, 0, nrun);
+  for (Int_t irun = 0; irun < nrun; irun++) {
+    hr = CheckEnabledChannels(run[irun], kTRUE);
+    ha = CheckEnabledChannels(run[irun], kFALSE);
+    hReadout->SetBinContent(irun + 1, hr->Integral());
+    hActive->SetBinContent(irun + 1, ha->Integral());
+    hReadout->GetXaxis()->SetBinLabel(irun + 1, Form("%d", run[irun]));
+    delete hr; delete ha;
+  }
+  
+  hReadout->SetMarkerStyle(20);
+  hReadout->SetMarkerColor(4);
+  hActive->SetMarkerStyle(25);
+  hActive->SetMarkerColor(2);
+  hReadout->Sumw2();
+  hActive->Sumw2();
+  hReadout->Divide(hReadout, hActive, 1., 1., "B");
+  hActive->Scale(1. / 152928.);
+  hReadout->SetMinimum(0.);
+  hReadout->SetMaximum(1.);
+  hReadout->Draw("E");
+  hActive->Draw("E, same");
+  TLegend *l = gPad->BuildLegend();
+  l->SetFillStyle(0);
+
+}
+
+TH1F *
 CheckEnabledChannels(Int_t run, Bool_t checkROEff = kTRUE, const Char_t *dbString = "raw://")
 {
 
@@ -31,9 +77,6 @@ CheckEnabledChannels(Int_t run, Bool_t checkROEff = kTRUE, const Char_t *dbStrin
   }
   
   hEnabledMap->DrawCopy("colz");
-  TFile *fileout = TFile::Open("CheckEnabledChannels.root", "RECREATE");
-  hEnabledMap->Write();
-  hEnabledFlag->Write();
-  fileout->Close();
+  return hEnabledFlag;
 
 }

diff --git a/TOF/CheckReadoutEfficiency.C b/TOF/CheckReadoutEfficiency.C
index 2e228b9c013070f68b5015aa48eb1e7cf4d4e9f9..5f0a5a2086a42782d5e8635c8e4a12c22831eaa0 100644 (file)
--- a/TOF/CheckReadoutEfficiency.C
+++ b/TOF/CheckReadoutEfficiency.C
@@ -1,3 +1,4 @@
+TH1F *
 CheckReadoutEfficiency(Int_t run)
 {
 
@@ -10,6 +11,7 @@ CheckReadoutEfficiency(Int_t run)
 
 }
 
+TH1F *
 CheckReadoutEfficiency(const Char_t *fileName)
 {
 
@@ -18,6 +20,7 @@ CheckReadoutEfficiency(const Char_t *fileName)
   CheckReadoutEfficiency(cdbe);
 }
 
+TH1F *
 CheckReadoutEfficiency(AliCDBEntry *cdbe)
 {
 
@@ -51,9 +54,6 @@ CheckReadoutEfficiency(AliCDBEntry *cdbe)
   }
 
   hEfficiencyMap->DrawCopy("colz");
-  TFile *fout = TFile::Open("CheckReadoutEfficiency.root", "RECREATE");
-  hEfficiencyMap->Write();
-  hEfficiencyFlag->Write();
-  fout->Close();
-
+  
+  return hEfficiencyFlag;
 }