Skip to content

Commit

Permalink
DCHdigitizer --> DCHsimpleDigitizer (key4hep#8)
Browse files Browse the repository at this point in the history
* DCHdigitizer --> DCHsimpleDigitizer

* Forgotten one DCHdigitizer --> DCHsimpleDigitizer

* Forgotten another DCHdigitizer --> DCHsimpleDigitizer

* More DCHdigitizer --> DCHsimpleDigitizer
  • Loading branch information
BrieucF authored Sep 1, 2023
1 parent d050b50 commit 8c09714
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions DCHdigi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ install(TARGETS DCHdigi

install(FILES ${scripts} DESTINATION test)

SET(test_name "test_DCHdigitizer")
ADD_TEST(NAME t_${test_name} COMMAND k4run test/runDCHdigitizer.py)
SET(test_name "test_DCHsimpleDigitizer")
ADD_TEST(NAME t_${test_name} COMMAND k4run test/runDCHsimpleDigitizer.py)
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "DD4hep/Detector.h" // for dd4hep::VolumeManager
#include "DDSegmentation/BitFieldCoder.h"

/** @class DCHdigitizer
/** @class DCHsimpleDigitizer
*
* Algorithm for creating digitized drift chamber hits (still based on edm4hep::TrackerHit) from edm4hep::SimTrackerHit.
* You have to specify the expected resolution in z and in xy (distance to the wire). The smearing is applied in the wire reference frame.
Expand All @@ -28,10 +28,10 @@
*
*/

class DCHdigitizer : public GaudiAlgorithm {
class DCHsimpleDigitizer : public GaudiAlgorithm {
public:
explicit DCHdigitizer(const std::string&, ISvcLocator*);
virtual ~DCHdigitizer();
explicit DCHsimpleDigitizer(const std::string&, ISvcLocator*);
virtual ~DCHsimpleDigitizer();
/** Initialize.
* @return status code
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "DCHdigitizer.h"
#include "DCHsimpleDigitizer.h"

// DD4hep
#include "DD4hep/Detector.h"
Expand All @@ -7,17 +7,17 @@
// ROOT
#include "Math/Cylindrical3D.h"

DECLARE_COMPONENT(DCHdigitizer)
DECLARE_COMPONENT(DCHsimpleDigitizer)

DCHdigitizer::DCHdigitizer(const std::string& aName, ISvcLocator* aSvcLoc)
: GaudiAlgorithm(aName, aSvcLoc), m_geoSvc("GeoSvc", "DCHdigitizer") {
DCHsimpleDigitizer::DCHsimpleDigitizer(const std::string& aName, ISvcLocator* aSvcLoc)
: GaudiAlgorithm(aName, aSvcLoc), m_geoSvc("GeoSvc", "DCHsimpleDigitizer") {
declareProperty("inputSimHits", m_input_sim_hits, "Input sim tracker hit collection name");
declareProperty("outputDigiHits", m_output_digi_hits, "Output digitized tracker hit collection name");
}

DCHdigitizer::~DCHdigitizer() {}
DCHsimpleDigitizer::~DCHsimpleDigitizer() {}

StatusCode DCHdigitizer::initialize() {
StatusCode DCHsimpleDigitizer::initialize() {
// Initialize random services
if (service("RndmGenSvc", m_randSvc).isFailure()) {
error() << "Couldn't get RndmGenSvc!" << endmsg;
Expand Down Expand Up @@ -45,7 +45,7 @@ StatusCode DCHdigitizer::initialize() {
return StatusCode::SUCCESS;
}

StatusCode DCHdigitizer::execute() {
StatusCode DCHsimpleDigitizer::execute() {
// Get the input collection with Geant4 hits
const edm4hep::SimTrackerHitCollection* input_sim_hits = m_input_sim_hits.get();
debug() << "Input Sim Hit collection size: " << input_sim_hits->size() << endmsg;
Expand Down Expand Up @@ -111,4 +111,4 @@ StatusCode DCHdigitizer::execute() {
return StatusCode::SUCCESS;
}

StatusCode DCHdigitizer::finalize() { return StatusCode::SUCCESS; }
StatusCode DCHsimpleDigitizer::finalize() { return StatusCode::SUCCESS; }
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
eventProvider=particle_converter,
OutputLevel=DEBUG)
# Digitize tracker hits
from Configurables import DCHdigitizer
dch_digitizer = DCHdigitizer("DCHdigitizer",
from Configurables import DCHsimpleDigitizer
dch_digitizer = DCHsimpleDigitizer("DCHsimpleDigitizer",
inputSimHits = savetrackertool.SimTrackHits.Path,
outputDigiHits = savetrackertool.SimTrackHits.Path.replace("sim", "digi"),
readoutName = "CDCHHits",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ make get_data
## Execute Examples

```bash
k4run DCHdigi/test/runDCHdigitizer.py
k4run DCHdigi/test/runDCHsimpleDigitizer.py
```

```bash
Expand Down
4 changes: 2 additions & 2 deletions Tracking/test/runGenFitTrackingOnSimplifiedDriftChamber.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@
)

dch_reco_hit_name = saveDCHsimHitTool.SimTrackHits.Path.replace("sim", "reco")
from Configurables import DCHdigitizer
dch_digitizer = DCHdigitizer("DCHdigitizer",
from Configurables import DCHsimpleDigitizer
dch_digitizer = DCHsimpleDigitizer("DCHsimpleDigitizer",
inputSimHits = saveDCHsimHitTool.SimTrackHits.Path,
outputDigiHits = dch_reco_hit_name
)
Expand Down
4 changes: 2 additions & 2 deletions VTXdigi/test/runVTXdigitizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
eventProvider=particle_converter,
OutputLevel=INFO)
# Digitize tracker hits
from Configurables import DCHdigitizer
dch_digitizer = DCHdigitizer("DCHdigitizer",
from Configurables import DCHsimpleDigitizer
dch_digitizer = DCHsimpleDigitizer("DCHsimpleDigitizer",
inputSimHits = savetrackertool.SimTrackHits.Path,
outputDigiHits = savetrackertool.SimTrackHits.Path.replace("sim", "digi")
)
Expand Down

0 comments on commit 8c09714

Please sign in to comment.