changed behavior cut on integer values

[u/mrichter/AliRoot.git] / PWG2 / FLOW / AliFlowCommon / AliStarEventCuts.cxx

diff --git a/PWG2/FLOW/AliFlowCommon/AliStarEventCuts.cxx b/PWG2/FLOW/AliFlowCommon/AliStarEventCuts.cxx
index d560392a86100b3180dfa74481d4ebb3c3433309..4f0eb39e4314a0ef82ffb66fc38a26a4b4cfca59 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliStarEventCuts.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliStarEventCuts.cxx
@@ -20,6 +20,8 @@
 //
 // origin: Mikolaj Krzewicki (mikolaj.krzewicki@cern.ch)
 
+#include <limits.h>
+#include <float.h>
 #include "TNamed.h"
 #include "AliStarEvent.h"
 #include "AliStarEventCuts.h"
@@ -37,16 +39,16 @@ AliStarEventCuts::AliStarEventCuts():
   fEventNumberMin(INT_MIN),
   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),
@@ -88,16 +90,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;} //integer value: non inclusive bounds!
+  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;
 }