fix some merging artefacts
authorMikolaj Krzewicki <mkrzewic@localhost.localdomain>
Fri, 24 Jan 2014 09:57:05 +0000 (10:57 +0100)
committerMikolaj Krzewicki <mikolaj.krzewicki@cern.ch>
Fri, 31 Jan 2014 09:44:56 +0000 (10:44 +0100)
PWG/FLOW/Tasks/AliFlowEventCuts.h
PWG/FLOW/Tasks/AliFlowEventCuts.h.orig

index 796fd8f..82d7c42 100644 (file)
@@ -32,7 +32,7 @@ class AliFlowEventCuts : public AliFlowEventSimpleCuts {
   AliFlowEventCuts(const AliFlowEventCuts& someCuts);
   AliFlowEventCuts& operator=(const AliFlowEventCuts& someCuts);
   virtual  ~AliFlowEventCuts();
-  
+   
   virtual Bool_t IsSelected(TObject* obj, TObject *objmc);
 
   Bool_t PassesCuts(AliVEvent* event, AliMCEvent *mcevent);
@@ -60,7 +60,7 @@ class AliFlowEventCuts : public AliFlowEventSimpleCuts {
   void SetCutSPDvertexerAnomaly(Bool_t b=kTRUE) {fCutSPDvertexerAnomaly=b;}
   void SetCutZDCtiming(Bool_t c=kTRUE) {fCutZDCtiming=c;}
   void SetCutSPDTRKVtxZ(Bool_t b=kTRUE) {fCutSPDTRKVtxZ=b;}
-  void SetCutTPCmultiplicityOutliers(Bool_t b=kTRUE) {fCutTPCmultiplicityOutliers=b;}
+  void SetCutTPCmultiplicityOutliers(Bool_t b=kTRUE) {fCutTPCmultiplicityOutliers=b;}  
 
   Int_t GetNumberOfTracksMax() const {return fNumberOfTracksMax;}
   Int_t GetNumberOfTracksMin() const {return fNumberOfTracksMin;}
@@ -88,12 +88,15 @@ class AliFlowEventCuts : public AliFlowEventSimpleCuts {
                                                                fCutCentralityPercentile=kTRUE; }
   void SetCentralityPercentileMethod( refMultMethod m) {fCentralityPercentileMethod=m;}
   void SetUseCentralityUnchecked(Bool_t b=kTRUE) {fUseCentralityUnchecked=b;}
+
   Float_t GetCentrality(AliVEvent* event, AliMCEvent* mcEvent);
   void SetUsedDataset(Bool_t b=kTRUE) {fData2011=b;}
+
   void Browse(TBrowser* b);
   Long64_t Merge(TCollection* list);  
   TH2F *GetCorrelationTPCvsGlobalMultiplicity() {return fhistTPCvsGlobalMult;}  
 
+
  private:
   TList* fQA; //QA
   Bool_t fCutNumberOfTracks;//cut on # of tracks
index 0387bab..5935d62 100644 (file)
@@ -32,7 +32,7 @@ class AliFlowEventCuts : public AliFlowEventSimpleCuts {
   AliFlowEventCuts(const AliFlowEventCuts& someCuts);
   AliFlowEventCuts& operator=(const AliFlowEventCuts& someCuts);
   virtual  ~AliFlowEventCuts();
-   
+  
   virtual Bool_t IsSelected(TObject* obj, TObject *objmc);
 
   Bool_t PassesCuts(AliVEvent* event, AliMCEvent *mcevent);
@@ -60,7 +60,7 @@ class AliFlowEventCuts : public AliFlowEventSimpleCuts {
   void SetCutSPDvertexerAnomaly(Bool_t b=kTRUE) {fCutSPDvertexerAnomaly=b;}
   void SetCutZDCtiming(Bool_t c=kTRUE) {fCutZDCtiming=c;}
   void SetCutSPDTRKVtxZ(Bool_t b=kTRUE) {fCutSPDTRKVtxZ=b;}
-  void SetCutTPCmultiplicityOutliers(Bool_t b=kTRUE) {fCutTPCmultiplicityOutliers=b;}  
+  void SetCutTPCmultiplicityOutliers(Bool_t b=kTRUE) {fCutTPCmultiplicityOutliers=b;}
 
   Int_t GetNumberOfTracksMax() const {return fNumberOfTracksMax;}
   Int_t GetNumberOfTracksMin() const {return fNumberOfTracksMin;}
@@ -88,14 +88,16 @@ class AliFlowEventCuts : public AliFlowEventSimpleCuts {
                                                                fCutCentralityPercentile=kTRUE; }
   void SetCentralityPercentileMethod( refMultMethod m) {fCentralityPercentileMethod=m;}
   void SetUseCentralityUnchecked(Bool_t b=kTRUE) {fUseCentralityUnchecked=b;}
-  void SetUsedDataset(Bool_t b=kTRUE) {fData2011=b;}
   Float_t GetCentrality(AliVEvent* event, AliMCEvent* mcEvent);
+<<<<<<< HEAD
+=======
   
+>>>>>>> fix some merging artefacts
+  void SetUsedDataset(Bool_t b=kTRUE) {fData2011=b;}
   void Browse(TBrowser* b);
   Long64_t Merge(TCollection* list);  
   TH2F *GetCorrelationTPCvsGlobalMultiplicity() {return fhistTPCvsGlobalMult;}  
 
-
  private:
   TList* fQA; //QA
   Bool_t fCutNumberOfTracks;//cut on # of tracks
@@ -129,8 +131,11 @@ class AliFlowEventCuts : public AliFlowEventSimpleCuts {
   Bool_t fCutSPDvertexerAnomaly; //cut on the spd vertexer anomaly
   Bool_t fCutSPDTRKVtxZ; //require compatibility between SPDvertexz TRKvertexz
   Bool_t fCutTPCmultiplicityOutliers; //cut TPC multiplicity outliers
+  Bool_t fCutCentralityPercentile; //cut on centrality perc. from AliESDCentrality
   Bool_t fUseCentralityUnchecked; //use the unchecked method
   refMultMethod fCentralityPercentileMethod; //where to get the percentile from
+  Float_t fCentralityPercentileMax; // max centr. perc
+  Float_t fCentralityPercentileMin; // min centr. perc
   Bool_t fCutZDCtiming;   //cut on ZDC timing
   AliTriggerAnalysis fTrigAna; //trigger analysis object
   Bool_t fCutImpactParameter; //cut on impact parameter (MC header)