Fixing ompilation warnings

[u/mrichter/AliRoot.git] / PHOS / AliPHOSCalibHistoProducer.cxx

diff --git a/PHOS/AliPHOSCalibHistoProducer.cxx b/PHOS/AliPHOSCalibHistoProducer.cxx
index 194c04b9a07c5b97fbea9eaf4d4e4199a450964d..5c2a2b06a2fbe7adfa38c2cf50d8ad2270def201 100644 (file)
--- a/PHOS/AliPHOSCalibHistoProducer.cxx
+++ b/PHOS/AliPHOSCalibHistoProducer.cxx
@@ -31,13 +31,14 @@
 #include "TH2F.h"
 #include "TFile.h"
 #include "AliPHOSRawDecoder.h"
+#include "AliRawReader.h"
 
 ClassImp(AliPHOSCalibHistoProducer)
 
 //-----------------------------------------------------------------------------
 AliPHOSCalibHistoProducer::AliPHOSCalibHistoProducer() : 
-  fRawDecoder(0),fHistoFile(0),fUpdatingRate(100),fIsOldRCUFormat(kFALSE),
-  fEvents(0)
+  fRawDecoder(0),fHistoFile(0),fUpdatingRate(100),
+  fEvents(0),fNbins(100),fXlow(0.),fXup(1000.)
 {
   // Constructor: initializes data members
   // Checks existence of histograms which might have been left
@@ -60,6 +61,33 @@ AliPHOSCalibHistoProducer::AliPHOSCalibHistoProducer() :
   }
 }
 
+//-----------------------------------------------------------------------------            
+AliPHOSCalibHistoProducer::AliPHOSCalibHistoProducer(Int_t nbinsx, Double_t xlow, Double_t xup) :
+  fRawDecoder(0),fHistoFile(0),fUpdatingRate(100),
+  fEvents(0),fNbins(nbinsx),fXlow(xlow),fXup(xup)
+{
+  // Constructor: initializes data members.
+  // Checks existence of histograms which might have been left
+  // from the previous runs to continues their filling.
+  // In addition sets number of bins, low and upper limits common for all histograms.
+
+  fHistoFile =  new TFile("calibHisto.root","update");
+
+  for(Int_t module=0; module<5; module++) {
+    for(Int_t column=0; column<56; column++) {
+      for(Int_t row=0; row<64; row++) {
+        char hname[128];
+        sprintf(hname,"mod%dcol%drow%d",module,column,row);
+        TH1F* hist = (TH1F*)fHistoFile->Get(hname);
+        if(hist)
+          fAmpHisto[module][column][row]=hist;
+        else
+          fAmpHisto[module][column][row] = 0;
+      }
+    }
+  }
+}
+
 //-----------------------------------------------------------------------------
 AliPHOSCalibHistoProducer::~AliPHOSCalibHistoProducer()
 {
@@ -73,8 +101,8 @@ AliPHOSCalibHistoProducer::~AliPHOSCalibHistoProducer()
 //-----------------------------------------------------------------------------
 AliPHOSCalibHistoProducer::AliPHOSCalibHistoProducer(const AliPHOSCalibHistoProducer &histoproducer) :
   TObject(histoproducer),fRawDecoder(histoproducer.fRawDecoder),fHistoFile(histoproducer.fHistoFile),
-  fUpdatingRate(histoproducer.fUpdatingRate),fIsOldRCUFormat(histoproducer.fIsOldRCUFormat),
-  fEvents(histoproducer.fEvents)
+  fUpdatingRate(histoproducer.fUpdatingRate),
+  fEvents(histoproducer.fEvents),fNbins(histoproducer.fNbins),fXlow(histoproducer.fXlow),fXup(histoproducer.fXup)
 {
   //Copy constructor.
 
@@ -104,9 +132,12 @@ AliPHOSCalibHistoProducer& AliPHOSCalibHistoProducer::operator=
     fRawDecoder = histoproducer.fRawDecoder;
     fHistoFile = histoproducer.fHistoFile;
     fUpdatingRate = histoproducer.fUpdatingRate;
-    fIsOldRCUFormat = histoproducer.fIsOldRCUFormat;
     fEvents = histoproducer.fEvents;
-
+    fEvents = histoproducer.fEvents;
+    fNbins = histoproducer.fNbins;
+    fXlow = histoproducer.fXlow;
+    fXup = histoproducer.fXup;   
+    
     for(Int_t module=0; module<5; module++) {
       for(Int_t column=0; column<56; column++) {
        for(Int_t row=0; row<64; row++) {
@@ -136,15 +167,11 @@ void AliPHOSCalibHistoProducer::Run()
   Double_t energy;
   Int_t mod,col,row;
   
-  if(fIsOldRCUFormat)
-    fRawDecoder->SetOldRCUFormat(kTRUE);
-
   while(fRawDecoder->NextDigit()) {
     
     if(fRawDecoder->IsLowGain()) continue; 
 
     energy = fRawDecoder->GetEnergy();
-    if(energy<10) continue; // noise
     
     mod = fRawDecoder->GetModule()-1;
     col = fRawDecoder->GetColumn()-1;
@@ -156,12 +183,12 @@ void AliPHOSCalibHistoProducer::Run()
     else {
       char hname[128];
       sprintf(hname,"mod%dcol%drow%d",mod,col,row);
-      fAmpHisto[mod][col][row] = new TH1F(hname,hname,100,0.,1000.);
+      fAmpHisto[mod][col][row] = new TH1F(hname,hname,fNbins,fXlow,fXup);
       fAmpHisto[mod][col][row]->Fill(energy);
     }
-    
+  }
     // update histograms in local file every 100th event
-    if(fEvents%fUpdatingRate == 0) {
+    if(fEvents != 0 && fEvents%fUpdatingRate == 0) {
       AliInfo(Form("Updating histo file, event %d, run %d\n",
                   fEvents,fRawDecoder->GetRawReader()->GetRunNumber()));
       UpdateHistoFile();
@@ -169,7 +196,6 @@ void AliPHOSCalibHistoProducer::Run()
     
     //   UpdateHistoFile();
     //   AliInfo(Form("%d events of run %d processed.",iEvent,runNum));
-  }
   
   fEvents++;