fix cuts

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.cxx b/PWG2/FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.cxx
index 6251012c0ae90e5961773a3639e8f33ecf80d867..3c77ed523b66a121ac159c10dc9fd6ce815c5deb 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.cxx
@@ -37,13 +37,13 @@ AliFlowTrackSimpleCuts::AliFlowTrackSimpleCuts():
   TNamed(),
   fCutPt(kFALSE),
   fPtMax(FLT_MAX),
-  fPtMin(FLT_MIN),
+  fPtMin(-FLT_MAX),
   fCutEta(kFALSE),
   fEtaMax(FLT_MAX),
-  fEtaMin(FLT_MIN),
+  fEtaMin(-FLT_MAX),
   fCutPhi(kFALSE),
   fPhiMax(FLT_MAX),
-  fPhiMin(FLT_MIN),
+  fPhiMin(-FLT_MAX),
   fCutPID(kFALSE),
   fPID(0),
   fCutCharge(kFALSE),
@@ -97,11 +97,11 @@ AliFlowTrackSimpleCuts::AliFlowTrackSimpleCuts():
 Bool_t AliFlowTrackSimpleCuts::PassesCuts(const AliFlowTrackSimple *track) const
 {
   //simple method to check if the simple track passes the simple cuts
-  if(fCutPt) if (track->Pt() < fPtMin || track->Pt() >= fPtMax ) return kFALSE;
-  if(fCutEta) if (track->Eta() < fEtaMin || track->Eta() >= fEtaMax ) return kFALSE;
-  if(fCutPhi) if (track->Phi() < fPhiMin || track->Phi() >= fPhiMax ) return kFALSE;
-  if(fCutPID) if (track->PID() != fPID) return kFALSE;
-  if(fCutCharge) if (track->Charge() != fCharge) return kFALSE;
+  if(fCutPt) {if (track->Pt() < fPtMin || track->Pt() >= fPtMax ) return kFALSE;}
+  if(fCutEta) {if (track->Eta() < fEtaMin || track->Eta() >= fEtaMax ) return kFALSE;}
+  if(fCutPhi) {if (track->Phi() < fPhiMin || track->Phi() >= fPhiMax ) return kFALSE;}
+  //if(fCutPID) {if (track->PID() != fPID) return kFALSE;}
+  if(fCutCharge) {if (track->Charge() != fCharge) return kFALSE;}
   return kTRUE;
 }
 
@@ -109,10 +109,10 @@ Bool_t AliFlowTrackSimpleCuts::PassesCuts(const AliFlowTrackSimple *track) const
 Bool_t AliFlowTrackSimpleCuts::PassesCuts(TParticle* track) const
 {
   //simple method to check if the simple track passes the simple cuts
-  if(fCutPt) if (track->Pt() < fPtMin || track->Pt() >= fPtMax ) return kFALSE;
-  if(fCutEta) if (track->Eta() < fEtaMin || track->Eta() >= fEtaMax ) return kFALSE;
-  if(fCutPhi) if (track->Phi() < fPhiMin || track->Phi() >= fPhiMax ) return kFALSE;
-  if(fCutPID) if (track->GetPdgCode() != fPID) return kFALSE;
+  if(fCutPt)  {if (track->Pt() < fPtMin || track->Pt() >= fPtMax ) return kFALSE;}
+  if(fCutEta) {if (track->Eta() < fEtaMin || track->Eta() >= fEtaMax ) return kFALSE;}
+  if(fCutPhi) {if (track->Phi() < fPhiMin || track->Phi() >= fPhiMax ) return kFALSE;}
+  //if(fCutPID) {if (track->GetPdgCode() != fPID) return kFALSE;}
 
   //getting the charge from a tparticle is expensive
   //only do it if neccesary

diff --git a/PWG2/FLOW/AliFlowCommon/AliStarEventCuts.cxx b/PWG2/FLOW/AliFlowCommon/AliStarEventCuts.cxx
index d560392a86100b3180dfa74481d4ebb3c3433309..7116be417940bee0f647d538880e11990a5d17fd 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliStarEventCuts.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliStarEventCuts.cxx
@@ -31,34 +31,34 @@ AliStarEventCuts::AliStarEventCuts():
   TNamed(),
   fCutRunID(kFALSE),
   fRunIDMax(INT_MAX),
-  fRunIDMin(INT_MIN),
+  fRunIDMin(-INT_MAX),
   fCutEventNumber(kFALSE),
   fEventNumberMax(INT_MAX),
-  fEventNumberMin(INT_MIN),
+  fEventNumberMin(-INT_MAX),
   fCutVtxX(kFALSE),
   fVtxXMax(FLT_MAX),
-  fVtxXMin(FLT_MIN),
+  fVtxXMin(-FLT_MAX),
   fCutVtxY(kFALSE),
   fVtxYMax(FLT_MAX),
-  fVtxYMin(FLT_MIN),
+  fVtxYMin(-FLT_MAX),
   fCutVtxZ(kFALSE),
   fVtxZMax(FLT_MAX),
-  fVtxZMin(FLT_MIN),
+  fVtxZMin(-FLT_MAX),
   fCutBField(kFALSE),
   fBFieldMax(FLT_MAX),
-  fBFieldMin(FLT_MIN),
+  fBFieldMin(-FLT_MAX),
   fCutRefMult(kFALSE),
   fRefMultMax(INT_MAX),
-  fRefMultMin(INT_MIN),
+  fRefMultMin(-INT_MAX),
   fCutCentralityID(kFALSE),
   fCentralityIDMax(INT_MAX),
-  fCentralityIDMin(INT_MIN),
+  fCentralityIDMin(-INT_MAX),
   fCutNumberOfPrimaryTracks(kFALSE),
   fNumberOfPrimaryTracksMax(INT_MAX),
-  fNumberOfPrimaryTracksMin(INT_MIN),
+  fNumberOfPrimaryTracksMin(-INT_MAX),
   fCutNumberOfTracks(kFALSE),
   fNumberOfTracksMax(INT_MAX),
-  fNumberOfTracksMin(INT_MIN)
+  fNumberOfTracksMin(-INT_MAX)
 {
   //constructor 
 }
@@ -88,16 +88,16 @@ AliStarEventCuts::AliStarEventCuts():
 Bool_t AliStarEventCuts::PassesCuts(const AliStarEvent *event) const
 {
   ///check if event passes cuts
-  if(fCutRunID) if (event->GetRunID() < fRunIDMin || event->GetRunID() >= fRunIDMax ) return kFALSE;
-  if(fCutEventNumber) if (event->GetEventNumber() < fEventNumberMin || event->GetEventNumber() >= fEventNumberMax ) return kFALSE;
-  if(fCutVtxX) if (event->GetVtxX() < fVtxXMin || event->GetVtxX() >= fVtxXMax ) return kFALSE;
-  if(fCutVtxY) if (event->GetVtxY() < fVtxYMin || event->GetVtxY() >= fVtxYMax ) return kFALSE;
-  if(fCutVtxZ) if (event->GetVtxZ() < fVtxZMin || event->GetVtxZ() >= fVtxZMax ) return kFALSE;
-  if(fCutBField) if (event->GetBField() < fBFieldMin || event->GetBField() >= fBFieldMax ) return kFALSE;
-  if(fCutRefMult) if (event->GetRefMult() < fRefMultMin || event->GetRefMult() >= fRefMultMax ) return kFALSE;
-  if(fCutCentralityID) if (event->GetCentralityID() < fCentralityIDMin || event->GetCentralityID() >= fCentralityIDMax ) return kFALSE;
-  if(fCutNumberOfPrimaryTracks) if (event->GetNumberOfPrimaryTracks() < fNumberOfPrimaryTracksMin || event->GetNumberOfPrimaryTracks() >= fNumberOfPrimaryTracksMax ) return kFALSE;
-  if(fCutNumberOfTracks) if (event->GetNumberOfTracks() < fNumberOfTracksMin || event->GetNumberOfTracks() >= fNumberOfTracksMax ) return kFALSE;
+  if(fCutRunID) {if (event->GetRunID() < fRunIDMin || event->GetRunID() >= fRunIDMax ) return kFALSE;}
+  if(fCutEventNumber) {if (event->GetEventNumber() < fEventNumberMin || event->GetEventNumber() >= fEventNumberMax ) return kFALSE;}
+  if(fCutVtxX) {if (event->GetVtxX() < fVtxXMin || event->GetVtxX() >= fVtxXMax ) return kFALSE;}
+  if(fCutVtxY) {if (event->GetVtxY() < fVtxYMin || event->GetVtxY() >= fVtxYMax ) return kFALSE;}
+  if(fCutVtxZ) {if (event->GetVtxZ() < fVtxZMin || event->GetVtxZ() >= fVtxZMax ) return kFALSE;}
+  if(fCutBField) {if (event->GetBField() < fBFieldMin || event->GetBField() >= fBFieldMax ) return kFALSE;}
+  if(fCutRefMult) {if (event->GetRefMult() < fRefMultMin || event->GetRefMult() >= fRefMultMax ) return kFALSE;}
+  if(fCutCentralityID) {if (event->GetCentralityID() < fCentralityIDMin || event->GetCentralityID() >= fCentralityIDMax ) return kFALSE;}
+  if(fCutNumberOfPrimaryTracks) {if (event->GetNumberOfPrimaryTracks() < fNumberOfPrimaryTracksMin || event->GetNumberOfPrimaryTracks() >= fNumberOfPrimaryTracksMax ) return kFALSE;}
+  if(fCutNumberOfTracks) {if (event->GetNumberOfTracks() < fNumberOfTracksMin || event->GetNumberOfTracks() >= fNumberOfTracksMax ) return kFALSE;}
   return kTRUE;
 }
 

diff --git a/PWG2/FLOW/AliFlowCommon/AliStarTrackCuts.cxx b/PWG2/FLOW/AliFlowCommon/AliStarTrackCuts.cxx
index 48ad9470e27291818fd6a8d8e9c471e060ae7757..878640981cab92d2d8c5894f9e23a2890be4d43b 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliStarTrackCuts.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliStarTrackCuts.cxx
@@ -31,49 +31,49 @@ AliStarTrackCuts::AliStarTrackCuts():
   TNamed(),
   fCutID(kFALSE),
   fIDMax(INT_MAX),
-  fIDMin(INT_MIN),
+  fIDMin(-INT_MAX),
   fCutCharge(kFALSE),
   fChargeMax(INT_MAX),
-  fChargeMin(INT_MIN),
+  fChargeMin(-INT_MAX),
   fCutEta(kFALSE),
   fEtaMax(FLT_MAX),
-  fEtaMin(FLT_MIN),
+  fEtaMin(-FLT_MAX),
   fCutPhi(kFALSE),
   fPhiMax(FLT_MAX),
-  fPhiMin(FLT_MIN),
+  fPhiMin(-FLT_MAX),
   fCutPt(kFALSE),
   fPtMax(FLT_MAX),
-  fPtMin(FLT_MIN),
+  fPtMin(-FLT_MAX),
   fCutDCA(kFALSE),
   fDCAMax(FLT_MAX),
-  fDCAMin(FLT_MIN),
+  fDCAMin(-FLT_MAX),
   fCutNHits(kFALSE),
   fNHitsMax(INT_MAX),
-  fNHitsMin(INT_MIN),
+  fNHitsMin(-INT_MAX),
   fCutNHitsFit(kFALSE),
   fNHitsFitMax(INT_MAX),
-  fNHitsFitMin(INT_MIN),
+  fNHitsFitMin(-INT_MAX),
   fCutNHitsPoss(kFALSE),
   fNHitsPossMax(INT_MAX),
-  fNHitsPossMin(INT_MIN),
+  fNHitsPossMin(-INT_MAX),
   fCutNHitsDedx(kFALSE),
   fNHitsDedxMax(INT_MAX),
-  fNHitsDedxMin(INT_MIN),
+  fNHitsDedxMin(-INT_MAX),
   fCutdEdx(kFALSE),
   fdEdxMax(FLT_MAX),
-  fdEdxMin(FLT_MIN),
+  fdEdxMin(-FLT_MAX),
   fCutNSigElect(kFALSE),
   fNSigElectMax(FLT_MAX),
-  fNSigElectMin(FLT_MIN),
+  fNSigElectMin(-FLT_MAX),
   fCutNSigPi(kFALSE),
   fNSigPiMax(FLT_MAX),
-  fNSigPiMin(FLT_MIN),
+  fNSigPiMin(-FLT_MAX),
   fCutNSigK(kFALSE),
   fNSigKMax(FLT_MAX),
-  fNSigKMin(FLT_MIN),
+  fNSigKMin(-FLT_MAX),
   fCutNSigProton(kFALSE),
   fNSigProtonMax(FLT_MAX),
-  fNSigProtonMin(FLT_MIN),
+  fNSigProtonMin(-FLT_MAX),
   fCutFitRatio(kFALSE),
   fFitRatioMax(FLT_MAX),
   fFitRatioMin(FLT_MIN)
@@ -196,21 +196,21 @@ AliStarTrackCuts::AliStarTrackCuts():
 Bool_t AliStarTrackCuts::PassesCuts(const AliStarTrack *track) const
 {
   //check is track passes cuts
-  if(fCutID) if (track->GetID() < fIDMin || track->GetID() >= fIDMax ) return kFALSE;
-  if(fCutCharge) if (track->GetCharge() < fChargeMin || track->GetCharge() > fChargeMax ) return kFALSE;
-  if(fCutEta) if (track->GetEta() < fEtaMin || track->GetEta() > fEtaMax ) return kFALSE;
-  if(fCutPhi) if (track->GetPhi() < fPhiMin || track->GetPhi() > fPhiMax ) return kFALSE;
-  if(fCutPt) if (track->GetPt() < fPtMin || track->GetPt() > fPtMax ) return kFALSE;
-  if(fCutDCA) if (track->GetDCA() < fDCAMin || track->GetDCA() > fDCAMax ) return kFALSE;
-  if(fCutNHits) if (track->GetNHits() < fNHitsMin || track->GetNHits() > fNHitsMax ) return kFALSE;
-  if(fCutNHitsFit) if (track->GetNHitsFit() < fNHitsFitMin || track->GetNHitsFit() > fNHitsFitMax ) return kFALSE;
-  if(fCutNHitsPoss) if (track->GetNHitsPoss() < fNHitsPossMin || track->GetNHitsPoss() > fNHitsPossMax ) return kFALSE;
-  if(fCutNHitsDedx) if (track->GetNHitsDedx() < fNHitsDedxMin || track->GetNHitsDedx() > fNHitsDedxMax ) return kFALSE;
-  if(fCutdEdx) if (track->GetdEdx() < fdEdxMin || track->GetdEdx() > fdEdxMax ) return kFALSE;
-  if(fCutNSigElect) if (track->GetNSigElect() < fNSigElectMin || track->GetNSigElect() > fNSigElectMax ) return kFALSE;
-  if(fCutNSigPi) if (track->GetNSigPi() < fNSigPiMin || track->GetNSigPi() > fNSigPiMax ) return kFALSE;
-  if(fCutNSigK) if (track->GetNSigK() < fNSigKMin || track->GetNSigK() > fNSigKMax ) return kFALSE;
-  if(fCutNSigProton) if (track->GetNSigProton() < fNSigProtonMin || track->GetNSigProton() > fNSigProtonMax ) return kFALSE;
+  if(fCutID) {if (track->GetID() < fIDMin || track->GetID() >= fIDMax ) return kFALSE;}
+  if(fCutCharge) {if (track->GetCharge() < fChargeMin || track->GetCharge() > fChargeMax ) return kFALSE;}
+  if(fCutEta) {if (track->GetEta() < fEtaMin || track->GetEta() > fEtaMax ) return kFALSE;}
+  if(fCutPhi) {if (track->GetPhi() < fPhiMin || track->GetPhi() > fPhiMax ) return kFALSE;}
+  if(fCutPt) {if (track->GetPt() < fPtMin || track->GetPt() > fPtMax ) return kFALSE;}
+  if(fCutDCA) {if (track->GetDCA() < fDCAMin || track->GetDCA() > fDCAMax ) return kFALSE;}
+  if(fCutNHits) {if (track->GetNHits() < fNHitsMin || track->GetNHits() > fNHitsMax ) return kFALSE;}
+  if(fCutNHitsFit) {if (track->GetNHitsFit() < fNHitsFitMin || track->GetNHitsFit() > fNHitsFitMax ) return kFALSE;}
+  if(fCutNHitsPoss) {if (track->GetNHitsPoss() < fNHitsPossMin || track->GetNHitsPoss() > fNHitsPossMax ) return kFALSE;}
+  if(fCutNHitsDedx) {if (track->GetNHitsDedx() < fNHitsDedxMin || track->GetNHitsDedx() > fNHitsDedxMax ) return kFALSE;}
+  if(fCutdEdx) {if (track->GetdEdx() < fdEdxMin || track->GetdEdx() > fdEdxMax ) return kFALSE;}
+  if(fCutNSigElect) {if (track->GetNSigElect() < fNSigElectMin || track->GetNSigElect() > fNSigElectMax ) return kFALSE;}
+  if(fCutNSigPi) {if (track->GetNSigPi() < fNSigPiMin || track->GetNSigPi() > fNSigPiMax ) return kFALSE;}
+  if(fCutNSigK) {if (track->GetNSigK() < fNSigKMin || track->GetNSigK() > fNSigKMax ) return kFALSE;}
+  if(fCutNSigProton) {if (track->GetNSigProton() < fNSigProtonMin || track->GetNSigProton() > fNSigProtonMax ) return kFALSE;}
   if(fCutFitRatio)
   {
     Int_t nhitsposs =  track->GetNHitsPoss();