Merge pull request #18779 from slava77/CMSSW_9_2_X_2017-05-16-1100/si…

…gn911/ctppsDiamondTrack_yPosition recover multi-thread reproducibility in CTPPS diamond local track y position
cms-sw · May 18, 2017 · 05a0425 · 05a0425
2 parents 8de94eb + 08e9f21
commit 05a0425
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondTrackRecognition.h b/RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondTrackRecognition.h
@@ -63,6 +63,8 @@ class CTPPSDiamondTrackRecognition
 
     float yPosition_;
     float yWidth_;
+    float yPositionInitial_;
+    float yWidthInitial_;
 
     /// Function for pad efficiency
     TF1 hit_f_;

diff --git a/RecoCTPPS/TotemRPLocal/src/CTPPSDiamondTrackRecognition.cc b/RecoCTPPS/TotemRPLocal/src/CTPPSDiamondTrackRecognition.cc
@@ -24,8 +24,8 @@ CTPPSDiamondTrackRecognition::CTPPSDiamondTrackRecognition( const edm::Parameter
   sigma_               ( iConfig.getParameter<double>( "sigma" ) ),
   startFromX_          ( iConfig.getParameter<double>( "startFromX" ) ),
   stopAtX_             ( iConfig.getParameter<double>( "stopAtX" ) ),
-  yPosition_           ( iConfig.getParameter<double>( "yPosition" ) ),
-  yWidth_              ( iConfig.getParameter<double>( "yWidth" ) ),
+  yPositionInitial_    ( iConfig.getParameter<double>( "yPosition" ) ),
+  yWidthInitial_       ( iConfig.getParameter<double>( "yWidth" ) ),
   hit_f_( "hit_TF1_CTPPS", iConfig.getParameter<std::string>( "pixelEfficiencyFunction" ).c_str(), startFromX_, stopAtX_ )
 {
   if (sigma_==0.0) {
@@ -45,6 +45,8 @@ CTPPSDiamondTrackRecognition::clear()
 {
   hitParametersVectorMap_.clear();
   mhMap_.clear();
+  yPosition_ = yPositionInitial_;
+  yWidth_ = yWidthInitial_;
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -56,7 +58,7 @@ CTPPSDiamondTrackRecognition::addHit( const CTPPSDiamondRecHit& recHit )
   hitParametersVectorMap_[recHit.getOOTIndex()].emplace_back( recHit.getX(), recHit.getXWidth() );
 
   // Check vertical coordinates
-  if ( yPosition_ == 0.0 and yWidth_ == 0.0 ) {
+  if ( yPosition_ == yPositionInitial_ and yWidth_ == yWidthInitial_ ) {
     yPosition_ = recHit.getY();
     yWidth_ = recHit.getYWidth();
   }