add to voxelRes tree new branch L for lumi(CTP) COG

sevdokim · Jun 3, 2016 · 906cb3b · 906cb3b
1 parent 4e6751c
commit 906cb3b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/TPC/TPCcalib/AliTPCDcalibRes.cxx b/TPC/TPCcalib/AliTPCDcalibRes.cxx
@@ -8,6 +8,7 @@
 #include "AliDAQ.h"
 #include "AliTPCcalibDB.h"
 #include "AliTPCParam.h"
+#include "AliLumiTools.h"
 #include <TKey.h>
 #include <TF2.h>
 
@@ -164,6 +165,8 @@ AliTPCDcalibRes::AliTPCDcalibRes(int run,Long64_t tmin,Long64_t tmax,const char*
   ,fTOFBCTestH(0)
   ,fHVDTimeInt(0)
   ,fHVDTimeCorr(0)
+  ,fLumiCOG(0)
+  ,fLumiCTPGraph(0)
   ,fVDriftParam(0)
   ,fVDriftGraph(0)
   ,fCorrTime(0)
@@ -2939,6 +2942,7 @@ void AliTPCDcalibRes::WriteResTree()
   TFile* flOut = new TFile(GetVoxResFileName(),"recreate");
   TTree* resTree = new TTree("voxRes","final distortions, see GetListOfAliases");
   resTree->Branch("res", &voxRes);
+  resTree->Branch("L",&fLumiCOG);
   for (int i=0;i<kVoxDim;i++) {
     resTree->SetAlias(kVoxName[i],Form("bvox[%d]",i));
     resTree->SetAlias(Form("%sAV",kVoxName[i]),Form("stat[%d]",i));
@@ -3763,6 +3767,10 @@ void AliTPCDcalibRes::CreateCorrectionObject()
   // register tracks rate for lumi weighting
   fChebCorr->SetTracksRate(ExtractTrackRate());
   //
+  // calculate weighted lumi
+  fLumiCTPGraph = AliLumiTools::GetLumiFromCTP(fRun);
+  fLumiCOG = fChebCorr->GetLuminosityCOG(fLumiCTPGraph);
+  //
   AliSysInfo::AddStamp("CreateCorrectionObject",1,0,0,0);
 }
 

diff --git a/TPC/TPCcalib/AliTPCDcalibRes.h b/TPC/TPCcalib/AliTPCDcalibRes.h
@@ -136,7 +136,6 @@ class AliTPCDcalibRes: public TNamed
   Int_t GetSigmaTVDrift()  const {return fSigmaTVD;}
   void  SetDeltaTVDrift(int v=120) {fDeltaTVD = v;}
   void  SetSigmaTVDrift(int v=600) {fSigmaTVD = v;}
-
   //
   void ProcessFromDeltaTrees();
   void ProcessFromLocalBinnedTrees();
@@ -241,6 +240,8 @@ class AliTPCDcalibRes: public TNamed
   Int_t   GetMinTracksPerVDBin()        const {return fMinTracksPerVDBin;}
   Int_t   GetNTestTracks()              const {return fNTestTracks;}
   Float_t GetTestStat(int row, int col) const {return fTestStat[row][col];}
+  TGraph*  GetLumiGraph() const {return (TGraph*) fLumiCTPGraph;}
+  Float_t  GetLumiCOG()   const {return fLumiCOG;}
   //
   Int_t   GetXBinExact(float x);
   Float_t GetY2X(int ix, int iy);
@@ -499,11 +500,12 @@ class AliTPCDcalibRes: public TNamed
   Float_t  fValidFracXBin[kNSect2][kNPadRows]; // fraction of voxels valid per padrow
   Int_t    fNSmoothingFailedBins[kNSect2];     // number of failed bins/sector, should be 0 to produce parameterization
   TBits    fXBinIgnore[kNSect2];    // flag to ignore Xbin
+  Float_t  fLumiCOG;                // COG lumi for timebin
+  TGraph*  fLumiCTPGraph;           // lumi graph from CTP
   // ------------------------------VDrift correction
   TVectorD     *fVDriftParam;
   TGraphErrors *fVDriftGraph;  
   Float_t       fCorrTime;   //! 
-
   // -----------------------------Results of processing
   bres_t *fSectGVoxRes[kNSect2];         //! [fNGVoxPerSector] sectors results for geometric voxel
   TTree* fStatTree;                      //! tree with voxels statistics
@@ -568,7 +570,7 @@ class AliTPCDcalibRes: public TNamed
   static const Float_t kTPCRowX[]; // X of the pad-row
   static const Float_t kTPCRowDX[]; // pitch in X
 
-  ClassDef(AliTPCDcalibRes,14);
+  ClassDef(AliTPCDcalibRes,15);
 };
 
 //________________________________________________________________