A misplaced debug message removed and an option inserted to turn off the MC data

diff --git a/FMD/analysis/AliFMDAnalysisTaskDndeta.cxx b/FMD/analysis/AliFMDAnalysisTaskDndeta.cxx
index 13c32821944c3a3e6bb8fd3b6fe1e9184f8e37af..96957ca65b2ef6fff78f1f0e20e1e8a5b0308b30 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskDndeta.cxx
+++ b/FMD/analysis/AliFMDAnalysisTaskDndeta.cxx
@@ -40,7 +40,8 @@ AliFMDAnalysisTaskDndeta::AliFMDAnalysisTaskDndeta()
   fNMCevents(),
   fStandalone(kTRUE),
   fMCevent(0),
-  fLastTrackByStrip()
+  fLastTrackByStrip(),
+  fPrimary(kTRUE)
 {
   // Default constructor
   DefineInput (0, TList::Class());
@@ -59,7 +60,8 @@ AliFMDAnalysisTaskDndeta::AliFMDAnalysisTaskDndeta(const char* name, Bool_t SE):
     fNMCevents(),
     fStandalone(kTRUE),
     fMCevent(0),
-    fLastTrackByStrip()
+    fLastTrackByStrip(),
+    fPrimary(kTRUE)
 {
   fStandalone = SE;
   if(fStandalone) {
@@ -188,7 +190,7 @@ void AliFMDAnalysisTaskDndeta::Exec(Option_t */*option*/)
     }
   }
   
-  if(fMCevent)
+  if(fMCevent && fPrimary)
     ProcessPrimary();
   
   if(fStandalone) {
@@ -259,7 +261,7 @@ void AliFMDAnalysisTaskDndeta::ProcessPrimary() {
        firstTrack = kFALSE;
       }
     }
-     
+    
     for(Int_t j=0; j<particle->GetNumberOfTrackReferences();j++) {
       
       AliTrackReference* ref = particle->GetTrackReference(j);
@@ -271,13 +273,7 @@ void AliFMDAnalysisTaskDndeta::ProcessPrimary() {
       Float_t thisStripTrack = fLastTrackByStrip.operator()(det,ring,sec,strip);
       if(particle->Charge() != 0 && i != thisStripTrack ) {
        //Double_t x,y,z;
-       /*AliFMDGeometry* fmdgeo = AliFMDGeometry::Instance();
-       fmdgeo->Detector2XYZ(det,ring,sec,strip,x,y,z);
        
-       Float_t   phi   = TMath::ATan2(y,x);
-       if(phi<0) phi   = phi+2*TMath::Pi();
-       Float_t   r     = TMath::Sqrt(TMath::Power(x,2)+TMath::Power(y,2));
-       Float_t   theta = TMath::ATan2(r,z-vertex.At(2));*/
        Float_t   eta   = pars->GetEtaFromStrip(det,ring,sec,strip,vertex.At(2));//-1*TMath::Log(TMath::Tan(0.5*theta));
        TH1F* hHits = (TH1F*)fOutputList->FindObject(Form("hHits_FMD%d%c_vtxbin%d",det,ring,vertexBin));
        hHits->Fill(eta);
@@ -294,10 +290,10 @@ void AliFMDAnalysisTaskDndeta::ProcessPrimary() {
        
        
       }
-    }
+      }
     
     
-  }
+      }
   
 }
 //_____________________________________________________________________

diff --git a/FMD/analysis/AliFMDAnalysisTaskDndeta.h b/FMD/analysis/AliFMDAnalysisTaskDndeta.h
index c690f0763f6785ed6bd851bc97e4707dac0e2a27..698d84707df7a7cdcd3e5d61f03b58b857a73193 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskDndeta.h
+++ b/FMD/analysis/AliFMDAnalysisTaskDndeta.h
@@ -29,7 +29,8 @@ class AliFMDAnalysisTaskDndeta : public AliAnalysisTask
       fNMCevents(o.fNMCevents),
       fStandalone(o.fStandalone),
       fMCevent(o.fMCevent),
-      fLastTrackByStrip(o.fLastTrackByStrip) {}
+      fLastTrackByStrip(o.fLastTrackByStrip),
+      fPrimary(o.fPrimary) {}
     AliFMDAnalysisTaskDndeta& operator=(const AliFMDAnalysisTaskDndeta&) { return *this; }
     // Implementation of interface methods
     virtual void ConnectInputData(Option_t *option = "");
@@ -45,7 +46,7 @@ class AliFMDAnalysisTaskDndeta : public AliAnalysisTask
     void SetMCEvent(AliMCEvent* mcevent) {fMCevent = mcevent;}
     void ProcessPrimary();
     TList* GetOutputList() {return fOutputList;}
-    
+    void SetAnalyzePrimary(Bool_t prim) {fPrimary = prim;}
  private:
     Int_t         fDebug;        //  Debug flag
     TList*        fOutputList;
@@ -58,6 +59,7 @@ class AliFMDAnalysisTaskDndeta : public AliAnalysisTask
     Bool_t        fStandalone;
     AliMCEvent*   fMCevent;
     AliFMDFloatMap fLastTrackByStrip;
+    Bool_t        fPrimary;
     ClassDef(AliFMDAnalysisTaskDndeta, 0); // Analysis task for FMD analysis
 };
  

diff --git a/FMD/analysis/AliFMDAnalysisTaskSE.cxx b/FMD/analysis/AliFMDAnalysisTaskSE.cxx
index 7a99aeb32cb3f251fe7794dab314b5c15586b96e..ed56565300a67855dda192f549147ae23dee7850 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskSE.cxx
+++ b/FMD/analysis/AliFMDAnalysisTaskSE.cxx
@@ -12,7 +12,8 @@ AliAnalysisTaskSE(),
   fSharing("Sharing",kFALSE),
   fDensity("Density",kFALSE),
   fBackground("BackgroundCorrected",kFALSE),
-  fDndeta("dNdeta",kFALSE)
+  fDndeta("dNdeta",kFALSE),
+  fPrimary(kTRUE)
 {
   // Default constructor
 }
@@ -23,9 +24,10 @@ AliFMDAnalysisTaskSE::AliFMDAnalysisTaskSE(const char* name):
   fSharing("Sharing",kFALSE),
   fDensity("Density",kFALSE),
   fBackground("BackgroundCorrected",kFALSE),
-  fDndeta("dNdeta",kFALSE)
+  fDndeta("dNdeta",kFALSE),
+  fPrimary(kTRUE)
 {
- 
+  
   DefineOutput(1, TList::Class());
 }
 //_____________________________________________________________________
@@ -59,7 +61,7 @@ void AliFMDAnalysisTaskSE::UserCreateOutputObjects()
   fDndeta.SetInputVertex(vtxString1);
   fDndeta.SetInputList(bgcorlist); 
   fDndeta.SetOutputList(fListOfHistos); 
-  
+  fDndeta.SetAnalyzePrimary(fPrimary);
   fSharing.CreateOutputObjects();
   fDensity.CreateOutputObjects();
   fBackground.CreateOutputObjects();

diff --git a/FMD/analysis/AliFMDAnalysisTaskSE.h b/FMD/analysis/AliFMDAnalysisTaskSE.h
index 6f71c418f09ee7fde6704b0fbae01159cf2d2885..0779f42b0a7b4b1d28c3ab59571e33437694219d 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskSE.h
+++ b/FMD/analysis/AliFMDAnalysisTaskSE.h
@@ -18,13 +18,16 @@ class AliFMDAnalysisTaskSE : public AliAnalysisTaskSE
       fSharing(o.fSharing),
       fDensity(o.fDensity),
       fBackground(o.fBackground),
-      fDndeta(o.fDndeta){}
+      fDndeta(o.fDndeta),
+      fPrimary(o.fPrimary) {}
     AliFMDAnalysisTaskSE& operator=(const AliFMDAnalysisTaskSE&) { return *this; }
     
     virtual void Init();
     virtual void UserCreateOutputObjects();
     virtual void UserExec(Option_t* /*option*/);
     void  Terminate(Option_t */*option*/);
+    void  SetAnalyzePrimary(Bool_t prim) {fPrimary = prim;}
+    
  private:
     
     TList* fListOfHistos;
@@ -32,6 +35,7 @@ class AliFMDAnalysisTaskSE : public AliAnalysisTaskSE
     AliFMDAnalysisTaskDensity              fDensity;
     AliFMDAnalysisTaskBackgroundCorrection fBackground;
     AliFMDAnalysisTaskDndeta               fDndeta;
+    Bool_t                                 fPrimary;
     ClassDef(AliFMDAnalysisTaskSE, 1);
 
 };

diff --git a/FMD/analysis/AliFMDAnalysisTaskSharing.cxx b/FMD/analysis/AliFMDAnalysisTaskSharing.cxx
index bad13e9bbe8503b883e380a49cc0bba94fcebdc4..16ac3fc852358b5666cf3b5771d33469c06b522e 100644 (file)
--- a/FMD/analysis/AliFMDAnalysisTaskSharing.cxx
+++ b/FMD/analysis/AliFMDAnalysisTaskSharing.cxx
@@ -293,7 +293,7 @@ Float_t AliFMDAnalysisTaskSharing::GetMultiplicityOfStrip(Float_t mult,
     }
   if(mult > 15)
     {
-      std::cout<<"rejecting hit in FMD "<<det<<" "<<ring<<std::endl;
+      //   std::cout<<"rejecting hit in FMD "<<det<<" "<<ring<<std::endl;
       fSharedThis      = kFALSE;
       fSharedPrev      = kFALSE;
       return 0;