removes OCDB access during merging by splitting out the functionality

accessing OCDB from the histogram booking method.

diff --git a/TPC/AliTPCcalibLaser.cxx b/TPC/AliTPCcalibLaser.cxx
index 749e4e3e0709d47000bd4a4ace1537885e3dd3eb..6331fac40819cc9c59c6b6cc3f35734a02ce2745 100644 (file)
--- a/TPC/AliTPCcalibLaser.cxx
+++ b/TPC/AliTPCcalibLaser.cxx
@@ -649,7 +649,7 @@ void AliTPCcalibLaser::Process(AliESDEvent * event) {
   static Bool_t init=kFALSE;
   if (!init){
     init = kTRUE;  // way around for PROOF - to be investigated
-    MakeFitHistos();
+    UpdateFitHistos();
   }
   //
   for (Int_t id=0; id<336; id++){    
@@ -678,7 +678,7 @@ void AliTPCcalibLaser::MakeDistHisto(Int_t id){
     //
     //
     TH1F * hisdz = (TH1F*)fDeltaZ.At(id);
-    if (!hisdz) MakeFitHistos();
+    if (!hisdz) UpdateFitHistos();
     hisdz = (TH1F*)fDeltaZ.At(id);
     TH1F * hisP3 = (TH1F*)fDeltaP3.At(id);
     TH1F * hisP4 = (TH1F*)fDeltaP4.At(id);
@@ -2102,7 +2102,7 @@ void AliTPCcalibLaser::RefitLaserJW(Int_t id){
       //==========================//
       // Fill Residual Histograms //
       //==========================//
-      if (!fHisNclIn) MakeFitHistos(); 
+      if (!fHisNclIn) UpdateFitHistos(); 
 
       TH2F *profy = (TH2F*)fDeltaYres.UncheckedAt(id);
       TH2F *profz = (TH2F*)fDeltaZres.UncheckedAt(id);
@@ -3373,7 +3373,7 @@ Long64_t AliTPCcalibLaser::Merge(TCollection *li) {
   return 0;
 }
 
-void   AliTPCcalibLaser::MakeFitHistos(){
+void AliTPCcalibLaser::MakeFitHistos(){
   //
   // Make a fit histograms
   // 
@@ -3598,10 +3598,6 @@ void   AliTPCcalibLaser::MakeFitHistos(){
     }
   }
 
-  SetBeamParameters(fBeamOffsetZOuter, fBeamSlopeZOuter, fBeamSectorOuter,2);
-  SetBeamParameters(fBeamOffsetZInner, fBeamSlopeZInner, fBeamSectorInner,3);
-  SetBeamParameters(fBeamOffsetYOuter, fBeamSlopeYOuter, fBeamSectorOuter,0);
-  SetBeamParameters(fBeamOffsetYInner, fBeamSlopeYInner, fBeamSectorInner,1);
   //
   // Make THnSparse
   //
@@ -3700,6 +3696,15 @@ void   AliTPCcalibLaser::MakeFitHistos(){
   }
 }
 
+void AliTPCcalibLaser::UpdateFitHistos(){
+  //create the fit histos and set the beam parameters(needs OCDB access)
+  MakeFitHistos();
+  SetBeamParameters(fBeamOffsetZOuter, fBeamSlopeZOuter, fBeamSectorOuter,2);
+  SetBeamParameters(fBeamOffsetZInner, fBeamSlopeZInner, fBeamSectorInner,3);
+  SetBeamParameters(fBeamOffsetYOuter, fBeamSlopeYOuter, fBeamSectorOuter,0);
+  SetBeamParameters(fBeamOffsetYInner, fBeamSlopeYInner, fBeamSectorInner,1);
+}
+
 void AliTPCcalibLaser::MergeFitHistos(AliTPCcalibLaser * laser){
   //
   // Merge content of histograms 

diff --git a/TPC/AliTPCcalibLaser.h b/TPC/AliTPCcalibLaser.h
index d9911e5589ad32225fad6e5974dc154008465158..9a764a72ebb61e0175d6277046e05acd814ad850 100644 (file)
--- a/TPC/AliTPCcalibLaser.h
+++ b/TPC/AliTPCcalibLaser.h
@@ -58,6 +58,7 @@ public:
   Bool_t AcceptLaser(Int_t id);
   Float_t GetDistance(AliExternalTrackParam *track, AliTPCLaserTrack *ltrp);
   void   MakeFitHistos();
+  void   UpdateFitHistos();
   void   MergeFitHistos(AliTPCcalibLaser * add);
   void     Process(AliESDtrack *track, Int_t runNo=-1){AliTPCcalibBase::Process(track,runNo);};
   void     Process(AliTPCseed *track){return AliTPCcalibBase::Process(track);}