rm obsolete parameter DontEncodeSide from DDTPCDigiProcessor

iLCSoft · Jun 28, 2017 · 204ef84 · 204ef84
1 parent c6e56ae
commit 204ef84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/source/Digitisers/include/DDTPCDigiProcessor.h b/source/Digitisers/include/DDTPCDigiProcessor.h
@@ -176,8 +176,6 @@ class DDTPCDigiProcessor : public marlin::Processor {
   // gsl random number generator
   gsl_rng * _random {};
 
-  bool _dontEncodeSide {};
-
   float _pointResoRPhi0{}; // Coefficient for RPhi point res independant of drift length 
   float _pointResoPadPhi{}; // Coefficient for the point res dependance on relative phi angle to the pad verticle 
   float _diffRPhi{}; // Coefficient for the rphi point res dependance on diffusion 

diff --git a/source/Digitisers/src/DDTPCDigiProcessor.cc b/source/Digitisers/src/DDTPCDigiProcessor.cc
@@ -163,10 +163,6 @@ DDTPCDigiProcessor::DDTPCDigiProcessor() : Processor("DDTPCDigiProcessor")
                              _maxMerge ,
                              (int)3) ;
 
-  registerProcessorParameter( "DontEncodeSide" ,
-                              "Do not encode the side in the cellID of the TrackerHit",
-                             _dontEncodeSide ,
-                             (bool) true ) ;
 }
 
 
@@ -1136,13 +1132,7 @@ void DDTPCDigiProcessor::writeVoxelToHit( Voxel_tpc* aVoxel){
   (*_cellid_encoder)[ lcio::LCTrackerCellID::subdet() ] = lcio::ILDDetID::TPC ;
   (*_cellid_encoder)[ lcio::LCTrackerCellID::layer()  ] = seed_hit->getRowIndex() ;
   (*_cellid_encoder)[ lcio::LCTrackerCellID::module() ] = 0 ;
-
-
-  //fg: optionally encode the side (should become the default eventually)
-  if( ! _dontEncodeSide )
-    (*_cellid_encoder)[ lcio::LCTrackerCellID::side()   ] = ( pos[2] < 0 ?  -1 : 1 ) ;
-  else
-    (*_cellid_encoder)[ lcio::LCTrackerCellID::side()   ] = lcio::ILDDetID::barrel ;
+  (*_cellid_encoder)[ lcio::LCTrackerCellID::side()   ] = ( pos[2] < 0 ?  -1 : 1 ) ;
 
   _cellid_encoder->setCellID( trkHit ) ;
 
@@ -1303,12 +1293,7 @@ void DDTPCDigiProcessor::writeMergedVoxelsToHit( vector <Voxel_tpc*>* hitsToMerg
   (*_cellid_encoder)[ lcio::LCTrackerCellID::subdet() ] = lcio::ILDDetID::TPC ;
   (*_cellid_encoder)[ lcio::LCTrackerCellID::layer()  ] = row ;
   (*_cellid_encoder)[ lcio::LCTrackerCellID::module() ] = 0 ;
-
-  //fg: optionally encode the side (should become the default eventually)
-  if( ! _dontEncodeSide )
-    (*_cellid_encoder)[ lcio::LCTrackerCellID::side()   ] = ( pos[2] < 0 ?  -1 : 1 ) ;
-  else
-    (*_cellid_encoder)[ lcio::LCTrackerCellID::side()   ] = lcio::ILDDetID::barrel ;
+  (*_cellid_encoder)[ lcio::LCTrackerCellID::side()   ] = ( pos[2] < 0 ?  -1 : 1 ) ;
 
   _cellid_encoder->setCellID( trkHit ) ;