Update file MManager.h

p348reco/MManager.h

@@ -69,8 +69,8 @@ struct MManager
  void AddEvent(const RecoEvent&);
  void AddEvent(const RecoEvent&,const MMcond);
  bool UpStreamOK() const;
- bool DownStreamOK(bool requireAtLeastTwo) const;
- bool CanTrack(bool requireAtLeastTwoDownstream=false) const;
+ bool CanTrackSimpleTracking() const;
+ bool CanTrackDeflectionOrGenfit() const;
  SimpleTrack SimpleTrackingMM();
  SimpleTrack PointDeflectionTracking();
  double GetAngleSimple();
@@ -94,6 +94,8 @@ private:
  TVector3 mm3;
  TVector3 mm4;
 
+ bool DownStreamOK(const int NMin) const;
+
   // EventDisplay crash on machines with Intel graphics, workaround:
   //   $ export LIBGL_ALWAYS_INDIRECT=1
   //   https://root.cern.ch/phpBB3/viewtopic.php?t=21274
@@ -188,20 +190,26 @@ bool MManager::UpStreamOK() const
 
 }
 
-bool MManager::DownStreamOK(bool requireAtLeastTwo) const
+bool MManager::DownStreamOK(const int NMin) const
 {
 
  const unsigned int Nup = downstream.size();
- const unsigned int NupMIN = requireAtLeastTwo ? 2 :1;
- if(Nup < NupMIN)     return false; //TODO: in theory is possible with just one
+ if(Nup < NMin)     return false; //TODO: in theory is possible with just one
  else return true;
 }
 
-bool MManager::CanTrack(bool requireAtLeastTwoDownstream) const
+bool MManager::CanTrackSimpleTracking() const
+{
+ //if(!UpStreamOK())cout << "not enough hit upstream" << endl;
+ //if(!DownStreamOK())cout << "not enough hit downstream" << endl;
+ return UpStreamOK() && DownStreamOK(2);
+}
+
+bool MManager::CanTrackDeflectionOrGenfit() const
 {
  //if(!UpStreamOK())cout << "not enough hit upstream" << endl;
  //if(!DownStreamOK())cout << "not enough hit downstream" << endl;
- return UpStreamOK() && DownStreamOK(requireAtLeastTwoDownstream);
+ return UpStreamOK() && DownStreamOK(1);
 }
 
 void MManager::CollectPointsSimple(const vector<const Micromega*>& vec,TVector3& mmup,TVector3& mmdown)
@@ -231,7 +239,7 @@ SimpleTrack MManager::SimpleTrackingMM()
 
  SimpleTrack st;
 
- if(!CanTrack(true))
+ if(!CanTrackSimpleTracking())
   return st;
 
  ///ELSE:simple tracking algorithm for the MM
@@ -254,7 +262,7 @@ SimpleTrack MManager::PointDeflectionTracking()
  //define track
  SimpleTrack st;
 
- if(!CanTrack())
+ if(!CanTrackDeflectionOrGenfit())
   return st;
 
  //use all point downstream and upstream to have an estimate on momentum reconstruction
@@ -295,11 +303,16 @@ double MManager::GetAngleSimple()
 
 void MManager::PrintMM(unsigned int verbose = 3)
 {
- if(CanTrack() && verbose > 1)
-  cout << "THIS EVENT TRACKING IS POSSIBLE" << endl;
+ if(CanTrackSimpleTracking() && verbose > 1)
+  cout << "THIS EVENT SIMPLE TRACKING IS POSSIBLE" << endl;
  else if(verbose > 1)
   cout << "THIS EVENT TRACKING IS NOT POSSIBLE" << endl;
 
+ if(CanTrackDeflectionOrGenfit() && verbose > 1)
+  cout << "THIS EVENT GENFIT TRACKING IS POSSIBLE" << endl;
+ else if(verbose > 1)
+  cout << "THIS EVENT GENFIT TRACKING IS NOT POSSIBLE" << endl;
+
  cout << "MM with hits upstream " << endl;
  for(auto it = upstream.begin();it!=upstream.end();++it)
   {
@@ -369,7 +382,7 @@ void MManager::GenfitInit(const TString geofile)
 void MManager::GenfitTrack()
 {
 
- if(!CanTrack())
+ if(!CanTrackDeflectionOrGenfit())
   return;
 
  typedef genfit::MeasurementProducer<genfit::mySpacepointDetectorHit, genfit::mySpacepointMeasurement> MyMeasurementProducer;