L1phase shift corrected

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

diff --git a/PHOS/AliPHOSReconstructor.cxx b/PHOS/AliPHOSReconstructor.cxx
index 96495a1ff9cfc8ed27d553fe7e2d450e272d4a28..438c6004418716ed8a39d98087dccc64e82eee0f 100644 (file)
--- a/PHOS/AliPHOSReconstructor.cxx
+++ b/PHOS/AliPHOSReconstructor.cxx
@@ -52,6 +52,7 @@
 #include "AliPHOSRawFitterv1.h"
 #include "AliPHOSRawFitterv2.h"
 #include "AliPHOSRawFitterv3.h"
+#include "AliPHOSRawFitterv4.h"
 #include "AliPHOSRawDigiProducer.h"
 #include "AliPHOSPulseGenerator.h"
 
@@ -163,59 +164,59 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
   emcbranch->SetAddress(&fgEMCRecPoints);
   emcbranch->GetEntry(0);
 
-  //#########Calculate trigger and set trigger info###########
+//   //#########Calculate trigger and set trigger info###########
 
-  AliPHOSTrigger tr ;
-  //   tr.SetPatchSize(1);//create 4x4 patches
-  tr.SetSimulation(kFALSE);
-  tr.Trigger(fgDigitsArray);
+//   AliPHOSTrigger tr ;
+//   //   tr.SetPatchSize(1);//create 4x4 patches
+//   tr.SetSimulation(kFALSE);
+//   tr.Trigger(fgDigitsArray);
   
-  Float_t maxAmp2x2  = tr.Get2x2MaxAmplitude();
-  Float_t maxAmpnxn  = tr.GetnxnMaxAmplitude();
-  Float_t ampOutOfPatch2x2  = tr.Get2x2AmpOutOfPatch() ;
-  Float_t ampOutOfPatchnxn  = tr.GetnxnAmpOutOfPatch() ;
-
-  Int_t iSM2x2      = tr.Get2x2SuperModule();
-  Int_t iSMnxn      = tr.GetnxnSuperModule();
-  Int_t iCrystalPhi2x2 = tr.Get2x2CrystalPhi();
-  Int_t iCrystalPhinxn = tr.GetnxnCrystalPhi();
-  Int_t iCrystalEta2x2 = tr.Get2x2CrystalEta();
-  Int_t iCrystalEtanxn = tr.GetnxnCrystalEta();
-
-  AliDebug(2, Form("Trigger 2x2 max amp %f, out amp %f, SM %d, iphi %d ieta %d",  
-                  maxAmp2x2, ampOutOfPatch2x2, iSM2x2,iCrystalPhi2x2, iCrystalEta2x2));
-  AliDebug(2, Form("Trigger 4x4 max amp %f , out amp %f, SM %d, iphi %d, ieta %d",
-                  maxAmpnxn, ampOutOfPatchnxn, iSMnxn,iCrystalPhinxn, iCrystalEtanxn));
-
-  // Attention! PHOS modules in order to calculate AbsId need to be 1-5 not 0-4 as returns trigger.
-  Int_t iRelId2x2 []= {iSM2x2+1,0,iCrystalPhi2x2,iCrystalEta2x2};
-  Int_t iAbsId2x2 =-1;
-  Int_t iRelIdnxn []= {iSMnxn+1,0,iCrystalPhinxn,iCrystalEtanxn};
-  Int_t iAbsIdnxn =-1;
-  TVector3    pos2x2(-1,-1,-1);
-  TVector3    posnxn(-1,-1,-1);
-  fGeom->RelToAbsNumbering(iRelId2x2, iAbsId2x2);
-  fGeom->RelToAbsNumbering(iRelIdnxn, iAbsIdnxn);
-  fGeom->RelPosInAlice(iAbsId2x2, pos2x2);
-  fGeom->RelPosInAlice(iAbsIdnxn, posnxn);
-
-  TArrayF triggerPosition(6);
-  triggerPosition[0] = pos2x2(0) ;   
-  triggerPosition[1] = pos2x2(1) ;   
-  triggerPosition[2] = pos2x2(2) ;  
-  triggerPosition[3] = posnxn(0) ;   
-  triggerPosition[4] = posnxn(1) ;   
-  triggerPosition[5] = posnxn(2) ;  
-
-  TArrayF triggerAmplitudes(4);
-  triggerAmplitudes[0] = maxAmp2x2 ;   
-  triggerAmplitudes[1] = ampOutOfPatch2x2 ;    
-  triggerAmplitudes[2] = maxAmpnxn ;   
-  triggerAmplitudes[3] = ampOutOfPatchnxn ;   
-
-  //esd->SetPHOSTriggerCells(triggerPosition);
-  esd->AddPHOSTriggerPosition(triggerPosition);
-  esd->AddPHOSTriggerAmplitudes(triggerAmplitudes);
+//   Float_t maxAmp2x2  = tr.Get2x2MaxAmplitude();
+//   Float_t maxAmpnxn  = tr.GetnxnMaxAmplitude();
+//   Float_t ampOutOfPatch2x2  = tr.Get2x2AmpOutOfPatch() ;
+//   Float_t ampOutOfPatchnxn  = tr.GetnxnAmpOutOfPatch() ;
+
+//   Int_t iSM2x2      = tr.Get2x2SuperModule();
+//   Int_t iSMnxn      = tr.GetnxnSuperModule();
+//   Int_t iCrystalPhi2x2 = tr.Get2x2CrystalPhi();
+//   Int_t iCrystalPhinxn = tr.GetnxnCrystalPhi();
+//   Int_t iCrystalEta2x2 = tr.Get2x2CrystalEta();
+//   Int_t iCrystalEtanxn = tr.GetnxnCrystalEta();
+
+//   AliDebug(2, Form("Trigger 2x2 max amp %f, out amp %f, SM %d, iphi %d ieta %d",  
+//                maxAmp2x2, ampOutOfPatch2x2, iSM2x2,iCrystalPhi2x2, iCrystalEta2x2));
+//   AliDebug(2, Form("Trigger 4x4 max amp %f , out amp %f, SM %d, iphi %d, ieta %d",
+//                maxAmpnxn, ampOutOfPatchnxn, iSMnxn,iCrystalPhinxn, iCrystalEtanxn));
+
+//   // Attention! PHOS modules in order to calculate AbsId need to be 1-5 not 0-4 as returns trigger.
+//   Int_t iRelId2x2 []= {iSM2x2+1,0,iCrystalPhi2x2,iCrystalEta2x2};
+//   Int_t iAbsId2x2 =-1;
+//   Int_t iRelIdnxn []= {iSMnxn+1,0,iCrystalPhinxn,iCrystalEtanxn};
+//   Int_t iAbsIdnxn =-1;
+//   TVector3    pos2x2(-1,-1,-1);
+//   TVector3    posnxn(-1,-1,-1);
+//   fGeom->RelToAbsNumbering(iRelId2x2, iAbsId2x2);
+//   fGeom->RelToAbsNumbering(iRelIdnxn, iAbsIdnxn);
+//   fGeom->RelPosInAlice(iAbsId2x2, pos2x2);
+//   fGeom->RelPosInAlice(iAbsIdnxn, posnxn);
+
+//   TArrayF triggerPosition(6);
+//   triggerPosition[0] = pos2x2(0) ;   
+//   triggerPosition[1] = pos2x2(1) ;   
+//   triggerPosition[2] = pos2x2(2) ;  
+//   triggerPosition[3] = posnxn(0) ;   
+//   triggerPosition[4] = posnxn(1) ;   
+//   triggerPosition[5] = posnxn(2) ;  
+
+//   TArrayF triggerAmplitudes(4);
+//   triggerAmplitudes[0] = maxAmp2x2 ;   
+//   triggerAmplitudes[1] = ampOutOfPatch2x2 ;    
+//   triggerAmplitudes[2] = maxAmpnxn ;   
+//   triggerAmplitudes[3] = ampOutOfPatchnxn ;   
+
+//   //esd->SetPHOSTriggerCells(triggerPosition);
+//   esd->AddPHOSTriggerPosition(triggerPosition);
+//   esd->AddPHOSTriggerAmplitudes(triggerAmplitudes);
   
 
   //########################################
@@ -249,7 +250,7 @@ void AliPHOSReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree,
   //########################################
 
   for (Int_t recpart = 0 ; recpart < nOfRecParticles ; recpart++) {
-    AliPHOSRecParticle  *rp    = dynamic_cast<AliPHOSRecParticle*>(recParticles->At(recpart));
+    AliPHOSRecParticle  *rp    = static_cast<AliPHOSRecParticle*>(recParticles->At(recpart));
     if (Debug()) 
       rp->Print();
     // Get track segment and EMC rec.point associated with this rec.particle
@@ -379,14 +380,16 @@ void  AliPHOSReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits
     mapping[i] = (AliAltroMapping*)maps->At(i);
   }
 
-  if      (strcmp(GetRecoParam()->EMCFitterVersion(),"v1")==0) 
+  if      (strcmp(GetRecoParam()->EMCFitterVersion(),"v0")==0) 
+    fitter=new AliPHOSRawFitterv0();
+  else if (strcmp(GetRecoParam()->EMCFitterVersion(),"v1")==0) 
     fitter=new AliPHOSRawFitterv1();
   else if (strcmp(GetRecoParam()->EMCFitterVersion(),"v2")==0) 
     fitter=new AliPHOSRawFitterv2();
   else if (strcmp(GetRecoParam()->EMCFitterVersion(),"v3")==0) 
     fitter=new AliPHOSRawFitterv3();
   else
-    fitter=new AliPHOSRawFitterv0();
+    fitter=new AliPHOSRawFitterv4();
 
   fitter->SubtractPedestals(GetRecoParam()->EMCSubtractPedestals());
   fitter->SetAmpOffset     (GetRecoParam()->GetGlobalAltroOffset());
@@ -493,7 +496,7 @@ void AliPHOSReconstructor::FillMisalMatrixes(AliESDEvent* esd)const{
   char path[255] ;
   TGeoHMatrix * m ;
   for(Int_t mod=0; mod<5; mod++){
-    sprintf(path,"/ALIC_1/PHOS_%d",mod+1) ; //In Geometry modules numbered 1,2,.,5
+    snprintf(path,255,"/ALIC_1/PHOS_%d",mod+1) ; //In Geometry modules numbered 1,2,.,5
     if (gGeoManager->cd(path)){
       m = gGeoManager->GetCurrentMatrix() ;
       esd->SetPHOSMatrix(new TGeoHMatrix(*m),mod) ;
@@ -507,6 +510,11 @@ void AliPHOSReconstructor::FillMisalMatrixes(AliESDEvent* esd)const{
 //==================================================================================
 Float_t AliPHOSReconstructor::CorrectNonlinearity(Float_t en){
 
+  //For backward compatibility, if no RecoParameters found
+  if(!GetRecoParam()){
+    return 0.0241+1.0504*en+0.000249*en*en ;
+  }
+
   if(strcmp(GetRecoParam()->GetNonlinearityCorrectionVersion(),"NoCorrection")==0){
     return en ;
   }