AliAnalysisTaskMuonTrackingEff: removal of warnings, passing the AliCheckDetElementRe...

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisTaskESDfilter.cxx

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index e1175a1bc257686abc10db20b63c8624fa8ab2b5..c428080e6dc6e24f14fb6cf471d82019491e9a7a 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -92,9 +92,11 @@ void AliAnalysisTaskESDfilter::UserExec(Option_t */*option*/)
 //\r
                                            \r
   Long64_t ientry = Entry();\r
-  if (fDebug > 0) printf("Filter: Analysing event # %5d\n", (Int_t) ientry);\r
-  if (fHighPthreshold == 0) AliInfo("detector PID signals are stored in each track");\r
-  if (!fPtshape) AliInfo("detector PID signals are not stored below the pt threshold");\r
+  if (fDebug > 0) {\r
+    printf("Filter: Analysing event # %5d\n", (Int_t) ientry);\r
+    if (fHighPthreshold == 0) AliInfo("detector PID signals are stored in each track");\r
+    if (!fPtshape) AliInfo("detector PID signals are not stored below the pt threshold");\r
+  }\r
 \r
   ConvertESDtoAOD();\r
 }\r
@@ -157,13 +159,13 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        header->SetOrbitNumber(esd->GetOrbitNumber());\r
        header->SetPeriodNumber(esd->GetPeriodNumber());\r
        header->SetEventType(esd->GetEventType());\r
-       header->SetMuonMagFieldScale(-999.); // FIXME\r
        header->SetCentrality(-999.);        // FIXME\r
     }\r
     \r
     header->SetTriggerMask(esd->GetTriggerMask()); \r
     header->SetTriggerCluster(esd->GetTriggerCluster());\r
     header->SetMagneticField(esd->GetMagneticField());\r
+    header->SetMuonMagFieldScale(esd->GetCurrentDip()/6000.);\r
     header->SetZDCN1Energy(esd->GetZDCN1Energy());\r
     header->SetZDCP1Energy(esd->GetZDCP1Energy());\r
     header->SetZDCN2Energy(esd->GetZDCN2Energy());\r
@@ -1199,9 +1201,11 @@ void AliAnalysisTaskESDfilter::SetAODPID(AliESDtrack *esdtrack, AliAODTrack *aod
     }// end else\r
 \r
     if (pidSave) {\r
+      if(!aodtrack->GetDetPid()){// prevent memory leak when calling SetAODPID twice for the same track\r
        detpid = new AliAODPid();\r
        SetDetectorRawSignals(detpid,esdtrack,timezero, bfield);\r
        aodtrack->SetDetPID(detpid);\r
+      }\r
     }\r
 }\r
 \r