Small corrections to FemtoEventReaders (centrality selection) + uncommented EvMult...

diff --git a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.cxx b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.cxx
index 2aa747ef44d6360f67c78311d7a08545f6266ae5..b6cec16fb702c8cfe9395f42cbbccf9dc9fc8a0d 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.cxx
+++ b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.cxx
@@ -308,7 +308,7 @@ void AliFemtoCutMonitorEventMult::Fill(const AliFemtoEvent* aEvent)
 void AliFemtoCutMonitorEventMult::Write()
 {
   // Write out the relevant histograms
-  // fEvMult->Write();
+  fEvMult->Write();
   fNormEvMult->Write();
   fPsiVZERO->Write();
 

diff --git a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx
index 0c4b8dd3b7285c2007937320bb34d5e0a72484f7..a017878b14d4edffef0566afaf6d2b1be142d31f 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx
+++ b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx
@@ -647,46 +647,25 @@ void AliFemtoEventReaderAOD::CopyAODtoFemtoEvent(AliFemtoEvent *tEvent)
   tEvent->SetNumberOfTracks(realnofTracks);//setting number of track which we read in event    
   tEvent->SetNormalizedMult(tracksPrim);
 
+  if (cent) {
+    tEvent->SetCentralityV0(cent->GetCentralityPercentile("V0M"));
+    tEvent->SetCentralityZNA(cent->GetCentralityPercentile("ZNA"));
+    tEvent->SetCentralityCL1(cent->GetCentralityPercentile("CL1"));
+    //    tEvent->SetCentralityFMD(cent->GetCentralityPercentile("FMD"));
+    //    tEvent->SetCentralityTrk(cent->GetCentralityPercentile("TRK"));
+  }
+
   if (fEstEventMult==kCentrality) {
-    //  AliCentrality *cent = fEvent->GetCentrality();
+    //AliCentrality *cent = fEvent->GetCentrality();
     //cout<<"AliFemtoEventReaderAOD:"<<lrint(10*cent->GetCentralityPercentile("V0M"))<<endl;
     if (cent) tEvent->SetNormalizedMult(lrint(10*cent->GetCentralityPercentile("V0M")));
     //  if (cent) tEvent->SetNormalizedMult((int) cent->GetCentralityPercentile("V0M"));
-    
-    if (cent) {
-      tEvent->SetCentralityV0(cent->GetCentralityPercentile("V0M"));
-      tEvent->SetCentralityZNA(cent->GetCentralityPercentile("ZNA"));
-      tEvent->SetCentralityCL1(cent->GetCentralityPercentile("CL1"));
-      //    tEvent->SetCentralityFMD(cent->GetCentralityPercentile("FMD"));
-      tEvent->SetCentralitySPD1(cent->GetCentralityPercentile("CL1"));
-      //    tEvent->SetCentralityTrk(cent->GetCentralityPercentile("TRK"));
-    }
   }
   else if (fEstEventMult==kCentralityZNA) {
-    //  AliCentrality *cent = fEvent->GetCentrality();
-    //cout<<"AliFemtoEventReaderAOD:"<<lrint(10*cent->GetCentralityPercentile("V0M"))<<endl;
     if (cent) tEvent->SetNormalizedMult(lrint(10*cent->GetCentralityPercentile("ZNA")));
-    //  if (cent) tEvent->SetNormalizedMult((int) cent->GetCentralityPercentile("V0M"));
-    
-    if (cent) {
-      tEvent->SetCentralityV0(cent->GetCentralityPercentile("ZNA"));
-      //    tEvent->SetCentralityFMD(cent->GetCentralityPercentile("FMD"));
-      tEvent->SetCentralitySPD1(cent->GetCentralityPercentile("CL1"));
-      //    tEvent->SetCentralityTrk(cent->GetCentralityPercentile("TRK"));
-    }
   }
   else if (fEstEventMult==kCentralityCL1) {
-    //  AliCentrality *cent = fEvent->GetCentrality();
-    //cout<<"AliFemtoEventReaderAOD:"<<lrint(10*cent->GetCentralityPercentile("V0M"))<<endl;
     if (cent) tEvent->SetNormalizedMult(lrint(10*cent->GetCentralityPercentile("CL1")));
-    //  if (cent) tEvent->SetNormalizedMult((int) cent->GetCentralityPercentile("V0M"));
-    
-    if (cent) {
-      tEvent->SetCentralityV0(cent->GetCentralityPercentile("CL1"));
-      //    tEvent->SetCentralityFMD(cent->GetCentralityPercentile("FMD"));
-      tEvent->SetCentralitySPD1(cent->GetCentralityPercentile("CL1"));
-      //    tEvent->SetCentralityTrk(cent->GetCentralityPercentile("TRK"));
-    }
   }
   else if(fEstEventMult==kGlobalCount){
     tEvent->SetNormalizedMult(tNormMult); //particles counted in the loop, trying to reproduce GetReferenceMultiplicity. If better (default) method appears it should be changed

diff --git a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx
index 495ed24c89e0175917e93affb55678b8bf74e7c1..1a89362867c4804a81c46e3f6e86e4af1924c328 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx
+++ b/PWGCF/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx
@@ -690,7 +690,7 @@ AliFemtoEvent* AliFemtoEventReaderESDChain::ReturnHbtEvent()
     hbtEvent->SetCentralityZNA(cent->GetCentralityPercentile("ZNA"));
     hbtEvent->SetCentralityCL1(cent->GetCentralityPercentile("CL1"));
     //    hbtEvent->SetCentralityFMD(cent->GetCentralityPercentile("FMD"));
-    hbtEvent->SetCentralitySPD1(cent->GetCentralityPercentile("CL1"));
+    //    hbtEvent->SetCentralitySPD1(cent->GetCentralityPercentile("CL1"));
     //    hbtEvent->SetCentralityTrk(cent->GetCentralityPercentile("TRK"));
 
     if (Debug()>1) printf("  FemtoReader Got Event with %f %f %f %f\n", cent->GetCentralityPercentile("V0M"), 0.0, cent->GetCentralityPercentile("CL1"), 0.0);