Merge pull request #314 from trackreco/hitSelWindowsForMultiIter-rb1

Duplicate removal, quality filter and hit selection windows improvements

Config.cc

@@ -1,7 +1,7 @@
 #include "Config.h"
 
 #include "TrackerInfo.h"
-#include "mkFit/SteeringParams.h"
+#include "mkFit/IterationConfig.h"
 
 namespace mkfit {
 
@@ -74,7 +74,6 @@ namespace Config
   bool  sim_val_for_cmssw = false;
   bool  sim_val     = false;
   bool  cmssw_val   = false;
-  bool  cmssw_export = false;
   bool  fit_val     = false;
   bool  readSimTrackStates = false;
   bool  inclusiveShorts = false;
@@ -85,11 +84,11 @@ namespace Config
 
   bool  removeDuplicates = false;
   bool  useHitsForDuplicates = true;
-  float maxdPhi = 0.5;
   float maxdPt  = 0.5;
+  float maxdPhi = 0.25;
   float maxdEta = 0.05;
+  float maxdR = 0.0025;
   float minFracHitsShared = 0.75;
-  float maxdRSquared = 0.000001; //corresponds to maxdR of 0.001
 
   bool mtvLikeValidation = false;
   bool mtvRequireSeeds = false;

Config.h

@@ -312,7 +312,6 @@ namespace Config
   extern bool sim_val_for_cmssw;
   extern bool sim_val;
   extern bool cmssw_val;
-  extern bool cmssw_export;
   extern bool fit_val;
   extern bool readSimTrackStates; // need this to fill pulls
   extern bool inclusiveShorts;
@@ -328,7 +327,7 @@ namespace Config
   extern float maxdPt;
   extern float maxdEta;
   extern float minFracHitsShared;
-  extern float maxdRSquared;
+  extern float maxdR;
 
   // config on seed cleaning
   constexpr float track1GeVradius = 87.6; // = 1/(c*B)

Event.cc

@@ -1,8 +1,6 @@
 #include "Event.h"
 #include "TrackerInfo.h"
 
-#include "mkFit/SteeringParams.h"
-
 //#define DEBUG
 #include "Debug.h"
 

Event.h

@@ -4,7 +4,7 @@
 #include "Track.h"
 #include "Validation.h"
 #include "Config.h"
-#include "mkFit/SteeringParams.h"
+
 #include <mutex>
 
 namespace mkfit {