Added Add method to the various correction classes and update AliSystematicSelection.

diff --git a/PWG0/AliCorrection.cxx b/PWG0/AliCorrection.cxx
index f7c2605c464543230c41326a37053705d73feede..314ab3a46074dc6227eebbd6f1b184575fc7ec4e 100644 (file)
--- a/PWG0/AliCorrection.cxx
+++ b/PWG0/AliCorrection.cxx
@@ -160,6 +160,18 @@ void AliCorrection::Divide()
   printf("INFO: In the central region the track correction of %s has %d empty bins\n", GetName(), emptyBins);
 }
 
+//____________________________________________________________________
+void AliCorrection::Add(AliCorrection* aCorrectionToAdd, Float_t c)
+{
+  //
+  // add to measured and generated the measured and generated of aCorrectionToAdd
+  // with the weight c
+
+  fEventCorr->Add(aCorrectionToAdd->GetEventCorrection(),c);
+  fTrackCorr->Add(aCorrectionToAdd->GetTrackCorrection(),c);
+}
+
+
 //____________________________________________________________________
 Bool_t AliCorrection::LoadHistograms(const Char_t* dir)
 {

diff --git a/PWG0/AliCorrection.h b/PWG0/AliCorrection.h
index 620b4099f61fff82408239137f67a5e6545e6802..56a67bb9255cf0b1fa2884caa4fb0a037571086b 100644 (file)
--- a/PWG0/AliCorrection.h
+++ b/PWG0/AliCorrection.h
@@ -41,6 +41,8 @@ public:
   void Multiply();
   void SetCorrectionToUnity();
 
+  void Add(AliCorrection* aCorrectionToAdd, Float_t c=1);
+
   virtual Bool_t LoadHistograms(const Char_t* dir = 0);
   virtual void SaveHistograms();
   virtual void DrawHistograms(const Char_t* name = 0);

diff --git a/PWG0/AliCorrectionMatrix.cxx b/PWG0/AliCorrectionMatrix.cxx
index c54a5323878b8898842ce1acd0bc4a798bd132ff..2407b4f260daf49c965ba3cb480492f599ac0341 100644 (file)
--- a/PWG0/AliCorrectionMatrix.cxx
+++ b/PWG0/AliCorrectionMatrix.cxx
@@ -189,6 +189,18 @@ void AliCorrectionMatrix::Multiply()
   fhGene->Multiply(fhMeas, fhCorr, 1, 1, "B");
 }
 
+//____________________________________________________________________
+void AliCorrectionMatrix::Add(AliCorrectionMatrix* aMatrixToAdd, Float_t c) {
+  //
+  // adds the measured and generated of aMatrixToAdd to measured and generated of this
+  // 
+  // NB: the correction will naturally stay the same
+  
+  fhMeas->Add(aMatrixToAdd->GetMeasuredHistogram(), c);
+  fhGene->Add(aMatrixToAdd->GetGeneratedHistogram(), c);
+}
+
+
 //____________________________________________________________________
 Bool_t AliCorrectionMatrix::LoadHistograms(const Char_t* dir)
 {

diff --git a/PWG0/AliCorrectionMatrix.h b/PWG0/AliCorrectionMatrix.h
index de28fb82f0635432262101e107e0b8f6b8665de1..359fa82d409121bd342837d17428d6f9f4aa3835 100644 (file)
--- a/PWG0/AliCorrectionMatrix.h
+++ b/PWG0/AliCorrectionMatrix.h
@@ -43,6 +43,8 @@ public:
   void Multiply();
   void SetCorrectionToUnity();
 
+  void Add(AliCorrectionMatrix* aMatrixToAdd, Float_t c=1);
+
   void SetAxisTitles(const Char_t* titleX="", const Char_t* titleY="", const Char_t* titleZ="");
 
   virtual Bool_t LoadHistograms(const Char_t* dir = 0);

diff --git a/PWG0/dNdEta/AlidNdEtaCorrection.cxx b/PWG0/dNdEta/AlidNdEtaCorrection.cxx
index 731ddb2196ac0ba28a0751c6756a795cf5a19e4b..8ae04a066bbed3d457222fe0a0bbcb3e823299bc 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaCorrection.cxx
+++ b/PWG0/dNdEta/AlidNdEtaCorrection.cxx
@@ -145,6 +145,36 @@ Long64_t AlidNdEtaCorrection::Merge(TCollection* list)
   return count+1;
 }
 
+//____________________________________________________________________
+void AlidNdEtaCorrection::Add(AlidNdEtaCorrection* aCorrectionsToAdd, Float_t c) {
+  //
+  // adds the measured and generated of aCorrectionsToAdd to measured and generated
+  // of all corrections in this
+
+  fTrack2ParticleCorrection      ->Add(aCorrectionsToAdd->GetTrack2ParticleCorrection() ,c);
+  fVertexRecoCorrection          ->Add(aCorrectionsToAdd->GetVertexRecoCorrection()     ,c);
+  fTriggerBiasCorrectionMBToINEL ->Add(aCorrectionsToAdd->GetTriggerBiasCorrectionINEL(),c);
+  fTriggerBiasCorrectionMBToNSD  ->Add(aCorrectionsToAdd->GetTriggerBiasCorrectionNSD() ,c);
+  fTriggerBiasCorrectionMBToND   ->Add(aCorrectionsToAdd->GetTriggerBiasCorrectionND()  ,c);
+    
+}
+
+//____________________________________________________________________
+void AlidNdEtaCorrection::Reset(void) {
+  //
+  // reset all corrections
+  // 
+
+  fTrack2ParticleCorrection      ->Reset();
+  fVertexRecoCorrection          ->Reset();
+  fTriggerBiasCorrectionMBToINEL ->Reset();
+  fTriggerBiasCorrectionMBToNSD  ->Reset();
+  fTriggerBiasCorrectionMBToND   ->Reset();
+    
+}
+
+
+
 //____________________________________________________________________
 Bool_t AlidNdEtaCorrection::LoadHistograms(const Char_t* dir)
 {

diff --git a/PWG0/dNdEta/AlidNdEtaCorrection.h b/PWG0/dNdEta/AlidNdEtaCorrection.h
index 6bb43e37fe0b7cffed1aeba31a72a6cfaf5138dc..63e1fcf167e35db739b90e2820976458136781dd 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaCorrection.h
+++ b/PWG0/dNdEta/AlidNdEtaCorrection.h
@@ -54,9 +54,12 @@ public:
   AliCorrection* GetTriggerBiasCorrectionND()   {return fTriggerBiasCorrectionMBToND;}
   AliCorrection* GetCorrection(CorrectionType correctionType);
 
+  void    Reset(void);
+  void    Add(AlidNdEtaCorrection* aCorrectionsToAdd, Float_t c=1);
+
   void    SaveHistograms();
   Bool_t  LoadHistograms(const Char_t* dir = 0);
-  void DrawHistograms();
+  void    DrawHistograms();
 
   Float_t GetMeasuredFraction(CorrectionType correctionType, Float_t ptCutOff, Float_t eta = -100, Bool_t debug = kFALSE);
 

diff --git a/PWG0/dNdEta/AlidNdEtaSystematicsSelector.cxx b/PWG0/dNdEta/AlidNdEtaSystematicsSelector.cxx
index dfccaecd0ea06adceb0ced6e992d3c91823db7a1..e00075fb4a6bfba2857a3b28170903e72ad8609c 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaSystematicsSelector.cxx
+++ b/PWG0/dNdEta/AlidNdEtaSystematicsSelector.cxx
@@ -361,6 +361,28 @@ Bool_t AlidNdEtaSystematicsSelector::Process(Long64_t entry)
     if (!esdTrack)
       continue;
 
+    Float_t eta = particle->Eta();
+    Float_t pt  = particle->Pt();
+    
+    // non diffractive
+    if (processtype!=92 && processtype!=93 && processtype!=94) { 
+      if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[0]->FillTrackedParticle(vtxMC[2], eta, pt);
+      if (vertexRecoStudy)  fdNdEtaCorrectionVertexReco[0] ->FillTrackedParticle(vtxMC[2], eta, pt);
+    }
+    
+    // single diffractive
+    if (processtype==92 || processtype==93) { 
+      if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[1]->FillTrackedParticle(vtxMC[2], eta, pt);
+      if (vertexRecoStudy)  fdNdEtaCorrectionVertexReco[1] ->FillTrackedParticle(vtxMC[2], eta, pt);
+    }
+
+    // double diffractive
+    if (processtype==94) { 
+      if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[2]->FillTrackedParticle(vtxMC[2], eta, pt);
+      if (vertexRecoStudy)  fdNdEtaCorrectionVertexReco[2] ->FillTrackedParticle(vtxMC[2], eta, pt);
+    }
+    
+
     // using the properties of the mc particle
     Int_t label = TMath::Abs(esdTrack->GetLabel());
     TParticle* particle = stack->Particle(label);
@@ -409,8 +431,6 @@ Bool_t AlidNdEtaSystematicsSelector::Process(Long64_t entry)
       case 2212: id = 2; break;
       default:   id = 3; break;
     }
-    Float_t eta = particle->Eta();
-    Float_t pt  = particle->Pt();
 
     if (vertexReconstructed && eventTriggered) {
       if (fdNdEtaCorrectionSpecies[id])
@@ -419,25 +439,6 @@ Bool_t AlidNdEtaSystematicsSelector::Process(Long64_t entry)
       if (fPIDTracks)
        fPIDTracks->Fill(particle->GetPdgCode());
     }
-
-    // non diffractive
-    if (processtype!=92 && processtype!=93 && processtype!=94) { 
-      if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[0]->FillTrackedParticle(vtxMC[2], eta, pt);
-      if (vertexRecoStudy)  fdNdEtaCorrectionVertexReco[0] ->FillTrackedParticle(vtxMC[2], eta, pt);
-    }
-    
-    // single diffractive
-    if (processtype==92 || processtype==93) { 
-      if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[1]->FillTrackedParticle(vtxMC[2], eta, pt);
-      if (vertexRecoStudy)  fdNdEtaCorrectionVertexReco[1] ->FillTrackedParticle(vtxMC[2], eta, pt);
-    }
-
-    // double diffractive
-    if (processtype==94) { 
-      if (triggerBiasStudy) fdNdEtaCorrectionTriggerBias[2]->FillTrackedParticle(vtxMC[2], eta, pt);
-      if (vertexRecoStudy)  fdNdEtaCorrectionVertexReco[2] ->FillTrackedParticle(vtxMC[2], eta, pt);
-    }
-
   } // end of track loop
 
   

diff --git a/PWG0/dNdEta/dNdEtaAnalysis.cxx b/PWG0/dNdEta/dNdEtaAnalysis.cxx
index 0d81fbd66dfa785d7a645fe9fab4d667f96ff558..21ae3b6a9b35aa91fce2dcbe166d2c9396b69589 100644 (file)
--- a/PWG0/dNdEta/dNdEtaAnalysis.cxx
+++ b/PWG0/dNdEta/dNdEtaAnalysis.cxx
@@ -292,8 +292,9 @@ void dNdEtaAnalysis::Finish(AlidNdEtaCorrection* correction, Float_t ptCut, Alid
     //printf("vertexBinGlobalBegin = %d, vertexBinWidth = %d\n", vertexBinGlobalBegin, vertexBinWidth);
     for (Int_t vertexPos=0; vertexPos<kVertexBinning; ++vertexPos)
     {
+
       Int_t vertexBinBegin = vertexBinGlobalBegin;
-      Int_t vertexBinEnd = vertexBinGlobalBegin + vertexBinWidth * (kVertexBinning-1);
+      Int_t vertexBinEnd   = vertexBinGlobalBegin + vertexBinWidth * (kVertexBinning-1);
 
       // the first histogram is always for the whole vertex range
       if (vertexPos > 0)
@@ -314,10 +315,14 @@ void dNdEtaAnalysis::Finish(AlidNdEtaCorrection* correction, Float_t ptCut, Alid
       Float_t sum = 0;
       Float_t sumError2 = 0;
       for (Int_t iVtx = vertexBinBegin; iVtx < vertexBinEnd; iVtx++)
-      {
-        if (vtxVsEta->GetBinContent(iVtx, iEta) != 0)
+      {      
+       if (vtxVsEta->GetBinContent(iVtx, iEta) != 0)
         {
           sum = sum + vtxVsEta->GetBinContent(iVtx, iEta);
+
+         if (sumError2 > 10e30)
+           printf("WARNING: sum of error2 is dangerously large - be prepared for crash... ");
+
           sumError2 = sumError2 + TMath::Power(vtxVsEta->GetBinError(iVtx, iEta),2);
         }
       }
@@ -333,7 +338,7 @@ void dNdEtaAnalysis::Finish(AlidNdEtaCorrection* correction, Float_t ptCut, Alid
       }
 
       printf("Eta: %d Vertex Range: %d %d, Event Count %f, Track Sum: %f, Track Sum corrected: %f\n", iEta, vertexBinBegin, vertexBinEnd, totalEvents, sum, sum / ptCutOffCorrection);
-
+      
       Float_t dndeta = sum / totalEvents;
       Float_t error  = TMath::Sqrt(sumError2) / totalEvents;
 
@@ -348,6 +353,7 @@ void dNdEtaAnalysis::Finish(AlidNdEtaCorrection* correction, Float_t ptCut, Alid
 
       fdNdEtaPtCutOffCorrected[vertexPos]->SetBinContent(iEta, dndeta);
       fdNdEtaPtCutOffCorrected[vertexPos]->SetBinError(iEta, error);
+
     }
   }
 }