Skip to content

Commit

Permalink
Restored header files for individual algorithms
Browse files Browse the repository at this point in the history
Realised that the header files for  individual algorithms are needed. Putting them back. If required we can move them to interface(.h) and src(.cc) areas.
  • Loading branch information
suchandradutta committed Jan 15, 2020
1 parent 878fd45 commit 91abd9c
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 82 deletions.
20 changes: 1 addition & 19 deletions SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <iostream>
#include <cmath>

#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h"
#include "SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand All @@ -11,24 +11,6 @@
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"

class PSPDigitizerAlgorithm : public Phase2TrackerDigitizerAlgorithm {
public:
PSPDigitizerAlgorithm(const edm::ParameterSet& conf);
~PSPDigitizerAlgorithm() override;

// initialization that cannot be done in the constructor
void init(const edm::EventSetup& es) override;

// void initializeEvent();
// run the algorithm to digitize a single det
void accumulateSimHits(const std::vector<PSimHit>::const_iterator inputBegin,
const std::vector<PSimHit>::const_iterator inputEnd,
const size_t inputBeginGlobalIndex,
const uint32_t tofBin,
const Phase2TrackerGeomDetUnit* pixdet,
const GlobalVector& bfield) override;
};

using namespace edm;

void PSPDigitizerAlgorithm::init(const edm::EventSetup& es) { es.get<TrackerDigiGeometryRecord>().get(geom_); }
Expand Down
23 changes: 23 additions & 0 deletions SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef _SimTracker_SiPhase2Digitizer_PSPDigitizerAlgorithm_h
#define _SimTracker_SiPhase2Digitizer_PSPDigitizerAlgorithm_h

#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h"

class PSPDigitizerAlgorithm : public Phase2TrackerDigitizerAlgorithm {
public:
PSPDigitizerAlgorithm(const edm::ParameterSet& conf);
~PSPDigitizerAlgorithm() override;

// initialization that cannot be done in the constructor
void init(const edm::EventSetup& es) override;

// void initializeEvent();
// run the algorithm to digitize a single det
void accumulateSimHits(const std::vector<PSimHit>::const_iterator inputBegin,
const std::vector<PSimHit>::const_iterator inputEnd,
const size_t inputBeginGlobalIndex,
const uint32_t tofBin,
const Phase2TrackerGeomDetUnit* pixdet,
const GlobalVector& bfield) override;
};
#endif
20 changes: 1 addition & 19 deletions SimTracker/SiPhase2Digitizer/plugins/PSSDigitizerAlgorithm.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <iostream>
#include <cmath>

#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h"
#include "SimTracker/SiPhase2Digitizer/plugins/PSSDigitizerAlgorithm.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand All @@ -11,24 +11,6 @@
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"

class PSSDigitizerAlgorithm : public Phase2TrackerDigitizerAlgorithm {
public:
PSSDigitizerAlgorithm(const edm::ParameterSet& conf);
~PSSDigitizerAlgorithm() override;

// initialization that cannot be done in the constructor
void init(const edm::EventSetup& es) override;

// void initializeEvent();
// run the algorithm to digitize a single det
void accumulateSimHits(const std::vector<PSimHit>::const_iterator inputBegin,
const std::vector<PSimHit>::const_iterator inputEnd,
const size_t inputBeginGlobalIndex,
const uint32_t tofBin,
const Phase2TrackerGeomDetUnit* pixdet,
const GlobalVector& bfield) override;
};

using namespace edm;

void PSSDigitizerAlgorithm::init(const edm::EventSetup& es) { es.get<TrackerDigiGeometryRecord>().get(geom_); }
Expand Down
23 changes: 23 additions & 0 deletions SimTracker/SiPhase2Digitizer/plugins/PSSDigitizerAlgorithm.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef _SimTracker_SiPhase2Digitizer_PSSDigitizerAlgorithm_h
#define _SimTracker_SiPhase2Digitizer_PSSDigitizerAlgorithm_h

#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h"

class PSSDigitizerAlgorithm : public Phase2TrackerDigitizerAlgorithm {
public:
PSSDigitizerAlgorithm(const edm::ParameterSet& conf);
~PSSDigitizerAlgorithm() override;

// initialization that cannot be done in the constructor
void init(const edm::EventSetup& es) override;

// void initializeEvent();
// run the algorithm to digitize a single det
void accumulateSimHits(const std::vector<PSimHit>::const_iterator inputBegin,
const std::vector<PSimHit>::const_iterator inputEnd,
const size_t inputBeginGlobalIndex,
const uint32_t tofBin,
const Phase2TrackerGeomDetUnit* pixdet,
const GlobalVector& bfield) override;
};
#endif
27 changes: 1 addition & 26 deletions SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <iostream>
#include <cmath>

#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h"
#include "SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.h"
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"
Expand All @@ -19,31 +19,6 @@
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"

class PixelDigitizerAlgorithm : public Phase2TrackerDigitizerAlgorithm {
public:
PixelDigitizerAlgorithm(const edm::ParameterSet& conf);
~PixelDigitizerAlgorithm() override;

// initialization that cannot be done in the constructor
void init(const edm::EventSetup& es) override;

// void initializeEvent();
// run the algorithm to digitize a single det
void accumulateSimHits(const std::vector<PSimHit>::const_iterator inputBegin,
const std::vector<PSimHit>::const_iterator inputEnd,
const size_t inputBeginGlobalIndex,
const uint32_t tofBin,
const Phase2TrackerGeomDetUnit* pixdet,
const GlobalVector& bfield) override;
void add_cross_talk(const Phase2TrackerGeomDetUnit* pixdet) override;

// Addition four xtalk-related parameters to PixelDigitizerAlgorithm specific parameters initialized in Phase2TrackerDigitizerAlgorithm
const double odd_row_interchannelCoupling_next_row_;
const double even_row_interchannelCoupling_next_row_;
const double odd_column_interchannelCoupling_next_column_;
const double even_column_interchannelCoupling_next_column_;
};

using namespace edm;
using namespace sipixelobjects;

Expand Down
30 changes: 30 additions & 0 deletions SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#ifndef _SimTracker_SiPhase2Digitizer_PixelDigitizerAlgorithm_h
#define _SimTracker_SiPhase2Digitizer_PixelDigitizerAlgorithm_h

#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h"

class PixelDigitizerAlgorithm : public Phase2TrackerDigitizerAlgorithm {
public:
PixelDigitizerAlgorithm(const edm::ParameterSet& conf);
~PixelDigitizerAlgorithm() override;

// initialization that cannot be done in the constructor
void init(const edm::EventSetup& es) override;

// void initializeEvent();
// run the algorithm to digitize a single det
void accumulateSimHits(const std::vector<PSimHit>::const_iterator inputBegin,
const std::vector<PSimHit>::const_iterator inputEnd,
const size_t inputBeginGlobalIndex,
const uint32_t tofBin,
const Phase2TrackerGeomDetUnit* pixdet,
const GlobalVector& bfield) override;
void add_cross_talk(const Phase2TrackerGeomDetUnit* pixdet) override;

// Addition four xtalk-related parameters to PixelDigitizerAlgorithm specific parameters initialized in Phase2TrackerDigitizerAlgorithm
const double odd_row_interchannelCoupling_next_row_;
const double even_row_interchannelCoupling_next_row_;
const double odd_column_interchannelCoupling_next_column_;
const double even_column_interchannelCoupling_next_column_;
};
#endif
19 changes: 1 addition & 18 deletions SimTracker/SiPhase2Digitizer/plugins/SSDigitizerAlgorithm.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <iostream>
#include <cmath>

#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h"
#include "SimTracker/SiPhase2Digitizer/plugins/SSDigitizerAlgorithm.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand All @@ -11,23 +11,6 @@
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"

class SSDigitizerAlgorithm : public Phase2TrackerDigitizerAlgorithm {
public:
SSDigitizerAlgorithm(const edm::ParameterSet& conf);
~SSDigitizerAlgorithm() override;

// initialization that cannot be done in the constructor
void init(const edm::EventSetup& es) override;

// run the algorithm to digitize a single det
void accumulateSimHits(const std::vector<PSimHit>::const_iterator inputBegin,
const std::vector<PSimHit>::const_iterator inputEnd,
const size_t inputBeginGlobalIndex,
const uint32_t tofBin,
const Phase2TrackerGeomDetUnit* pixdet,
const GlobalVector& bfield) override;
};

using namespace edm;

void SSDigitizerAlgorithm::init(const edm::EventSetup& es) { es.get<TrackerDigiGeometryRecord>().get(geom_); }
Expand Down
22 changes: 22 additions & 0 deletions SimTracker/SiPhase2Digitizer/plugins/SSDigitizerAlgorithm.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#ifndef _SimTracker_SiPhase2Digitizer_SSDigitizerAlgorithm_h
#define _SimTracker_SiPhase2Digitizer_SSDigitizerAlgorithm_h

#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h"

class SSDigitizerAlgorithm : public Phase2TrackerDigitizerAlgorithm {
public:
SSDigitizerAlgorithm(const edm::ParameterSet& conf);
~SSDigitizerAlgorithm() override;

// initialization that cannot be done in the constructor
void init(const edm::EventSetup& es) override;

// run the algorithm to digitize a single det
void accumulateSimHits(const std::vector<PSimHit>::const_iterator inputBegin,
const std::vector<PSimHit>::const_iterator inputEnd,
const size_t inputBeginGlobalIndex,
const uint32_t tofBin,
const Phase2TrackerGeomDetUnit* pixdet,
const GlobalVector& bfield) override;
};
#endif

0 comments on commit 91abd9c

Please sign in to comment.