fix editor messup

source/Digitisers/src/FixedPadSizeDiskLayout.cc

@@ -113,14 +113,8 @@ double FixedPadSizeDiskLayout::getPadWidth(int padIndex) const {
     // need to return padWidth in radians !!
     return _padWidth / _rows.at(rowNum).RCenter;
 
-<<<<<<< HEAD
-  }
-  catch(std::out_of_range&){
-    return 0. ;
-=======
   } catch (std::out_of_range&) {
     return 0.;
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
   }
 }
 
@@ -131,14 +125,8 @@ double FixedPadSizeDiskLayout::getPadPitch(int padIndex) const {
     // need to return padPitch in radians !!
     return _rows.at(rowNum).PhiPad;
 
-<<<<<<< HEAD
-  }
-  catch(std::out_of_range&){
-    return 0. ;
-=======
   } catch (std::out_of_range&) {
     return 0.;
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
   }
 }
 

source/Digitisers/src/TPCModularEndplate.h

@@ -25,11 +25,7 @@ class TPCModularEndplate {
   };
 
   /// no default c'tor
-<<<<<<< HEAD
-  TPCModularEndplate() = delete ;
-=======
   TPCModularEndplate() = delete;
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
   TPCModularEndplate(const TPCModularEndplate&) = delete;
   TPCModularEndplate& operator=(const TPCModularEndplate&) = delete;
 

source/Refitting/include/DDCellsAutomatonMV.h

@@ -71,26 +71,13 @@ class IMarlinTrkSystem;
 typedef std::vector<IHit*> RawTrack;
 
 class DDCellsAutomatonMV : public Processor {
-<<<<<<< HEAD
-
- public:
-
-  virtual Processor*  newProcessor() { return new DDCellsAutomatonMV ; }
-
-
-  DDCellsAutomatonMV() ;
-  DDCellsAutomatonMV(const DDCellsAutomatonMV&) = delete ;
-  DDCellsAutomatonMV& operator=(const DDCellsAutomatonMV&) = delete ;
-
-=======
 public:
   virtual Processor* newProcessor() { return new DDCellsAutomatonMV; }
 
   DDCellsAutomatonMV();
   DDCellsAutomatonMV(const DDCellsAutomatonMV&) = delete;
   DDCellsAutomatonMV& operator=(const DDCellsAutomatonMV&) = delete;
 
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
   /** Called at the begin of the job before anything is read.
    * Use to initialize the processor, e.g. book histograms.
    */
@@ -119,36 +106,11 @@ class DDCellsAutomatonMV : public Processor {
   int _nDivisionsInThetaMV{};
   int _nLayers{};
 
-<<<<<<< HEAD
- protected:
-  int nEvt{};
-
-  int _nDivisionsInPhi{};
-  int _nDivisionsInTheta{};
-  int _nDivisionsInPhiMV{};
-  int _nDivisionsInThetaMV{};
-  int _nLayers{};
-
-=======
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
   float _bField{};
 
   // two pi is not a constant in cmath. Calculate it, once!
   static const double TWOPI;
   UTIL::BitField64* _encoder{nullptr};
-<<<<<<< HEAD
-  int getDetectorID(TrackerHit* hit) { _encoder->setValue(hit->getCellID0()); return (*_encoder)[lcio::LCTrackerCellID::subdet()]; }
-  int getSideID(TrackerHit* hit)     { _encoder->setValue(hit->getCellID0()); return (*_encoder)[lcio::LCTrackerCellID::side()]; };
-  int getLayerID(TrackerHit* hit)    { _encoder->setValue(hit->getCellID0()); return (*_encoder)[lcio::LCTrackerCellID::layer()]; };
-  int getModuleID(TrackerHit* hit)   { _encoder->setValue(hit->getCellID0()); return (*_encoder)[lcio::LCTrackerCellID::module()]; };
-  int getSensorID(TrackerHit* hit)   { _encoder->setValue(hit->getCellID0()); return (*_encoder)[lcio::LCTrackerCellID::sensor()]; };
-
-  double _dPhi{};
-  double _dTheta{};
-
-  unsigned int _nLayersVTX{};
-  unsigned int _nLayersSIT{};
-=======
   int getDetectorID(TrackerHit* hit) {
     _encoder->setValue(hit->getCellID0());
     return (*_encoder)[lcio::LCTrackerCellID::subdet()];
@@ -172,7 +134,6 @@ class DDCellsAutomatonMV : public Processor {
 
   double _dPhi{};
   double _dTheta{};
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
 
   unsigned int _nLayersVTX{};
   unsigned int _nLayersSIT{};
@@ -276,17 +237,6 @@ class DDCellsAutomatonMV : public Processor {
 
   /** The quality of the output track collection */
   int _output_track_col_quality{};
-<<<<<<< HEAD
-
-  static const int _output_track_col_quality_GOOD;
-  static const int _output_track_col_quality_FAIR;
-  static const int _output_track_col_quality_POOR;
-
-  std::string _bestSubsetFinder{};
-
-} ;
-=======
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
 
   static const int _output_track_col_quality_GOOD;
   static const int _output_track_col_quality_FAIR;

source/Refitting/include/ExtrToSIT.h

@@ -54,15 +54,6 @@ class ExtrToSIT : public marlin::Processor {
   ExtrToSIT(const ExtrToSIT&) = delete;
   ExtrToSIT& operator=(const ExtrToSIT&) = delete;
 
-<<<<<<< HEAD
-  virtual marlin::Processor*  newProcessor() { return new ExtrToSIT ; }
-
-  ExtrToSIT() ;
-  ExtrToSIT(const ExtrToSIT&) = delete;
-  ExtrToSIT& operator=(const ExtrToSIT&) = delete;
-
-=======
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
   /** Called at the begin of the job before anything is read.
    * Use to initialize the processor, e.g. book histograms.
    */
@@ -110,40 +101,6 @@ class ExtrToSIT : public marlin::Processor {
 
   /** Input track collection name for refitting.
    */
-<<<<<<< HEAD
-  std::string _input_track_col_name {};
-
-  /** Input track relations name for refitting.
-   */
-  std::string _input_track_rel_name {};
-
-  /** Input SIT tracker summer hit collection.
-   */
-  std::string _sitColName {};
-
-  /** Input VXD tracker summer hit collection.
-   */
-  std::string _vxdColName {};
-
-  /** refitted track collection name.
-   */
-  std::string _output_track_col_name {};
-
-  /** Output track relations name for refitting.
-   */
-  std::string _output_track_rel_name {};
-
-  /** Output silicon track collection.
-   */
-  std::string _siTrkColName {};
-
-  /** pointer to the IMarlinTrkSystem instance 
-   */
-  MarlinTrk::IMarlinTrkSystem* _trksystem{nullptr} ;
-  std::string _trkSystemName{} ;
-
-  std::string _mcParticleCollectionName{} ;
-=======
   std::string _input_track_col_name{};
 
   /** Input track relations name for refitting.
@@ -174,7 +131,6 @@ class ExtrToSIT : public marlin::Processor {
    */
   MarlinTrk::IMarlinTrkSystem* _trksystem{nullptr};
   std::string _trkSystemName{};
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
 
   std::string _mcParticleCollectionName{};
 

source/Refitting/include/ExtrToTracker.h

@@ -57,14 +57,7 @@ class ExtrToTracker : public marlin::Processor {
 public:
   virtual marlin::Processor* newProcessor() { return new ExtrToTracker; }
 
-<<<<<<< HEAD
-
-  virtual marlin::Processor*  newProcessor() { return new ExtrToTracker ; }
-
-  ExtrToTracker() ;
-=======
   ExtrToTracker();
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
   ExtrToTracker(const ExtrToTracker&) = delete;
   ExtrToTracker& operator=(const ExtrToTracker&) = delete;
 
@@ -136,49 +129,6 @@ class ExtrToTracker : public marlin::Processor {
 
   /** Input track collection name for refitting.
    */
-<<<<<<< HEAD
-  std::string _input_track_col_name {};
-
-
-  /** output collection name for the not used hits.
-   */
-  std::string _output_not_used_col_name {};
-
-  /** output track collection name.
-   */
-  std::string _output_track_col_name {};
-
-  /** Output track relations name for refitting.
-   */
-  std::string _output_track_rel_name {};
-
-  /** pointer to the IMarlinTrkSystem instance 
-   */
-  MarlinTrk::IMarlinTrkSystem* _trksystem {nullptr};
-
-  /* std::string _mcParticleCollectionName ; */
-
-  bool _MSOn {};
-  bool _ElossOn {};
-  bool _SmoothOn {};
-  double _Max_Chi2_Incr {};
-  double _searchSigma {};
-
-  int _n_run {};
-  int _n_evt {};
-  int SITHitsFitted {};
-  int SITHitsNonFitted {};
-  int TotalSITHits {};
-  int _nHitsChi2 {};
-
-  float _bField{};
-
-  bool _performFinalRefit {};
-
-  bool _extrapolateForward{};
-
-  const dd4hep::rec::SurfaceMap* _map {nullptr};
-=======
   std::string _input_track_col_name{};
 
   /** output collection name for the not used hits.
@@ -215,30 +165,10 @@ class ExtrToTracker : public marlin::Processor {
   float _bField{};
 
   bool _performFinalRefit{};
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
 
   bool _extrapolateForward{};
 
-<<<<<<< HEAD
-  //processor parameters
-
-  StringVec _vecDigiHits{};
-  StringVec _vecSubdetName{};
-  std::vector<bool > _vecSubdetIsBarrel{};
-  std::vector<int > _vecSubdetNLayers{};
-  std::vector<int > _vecSubdetID{};
-  std::vector<LCCollection* > _vecDigiHitsCol{};
-  std::vector<std::map<dd4hep::CellID , std::vector<dd4hep::CellID > >* >  _vecMapNeighbours{};
-
-  std::vector<std::map<int , std::vector<TrackerHitPlane* > > > _vecMapsElHits{};
-
-  std::vector<std::vector<TrackerHitPlane* > > _vecvecHitsInCol{};
-
-
-} ;
-=======
   const dd4hep::rec::SurfaceMap* _map{nullptr};
->>>>>>> 665b5fed8309e84cc4197b80012c02c680e32b90
 
   // processor parameters