Make the DCHdigi in global coordinates the default

BrieucF · Feb 13, 2024 · d8e6722 · d8e6722
1 parent a87a20f
commit d8e6722
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/DCHdigi/dataFormatExtension/driftChamberHit.yaml b/DCHdigi/dataFormatExtension/driftChamberHit.yaml
@@ -9,7 +9,7 @@ options:
 
 datatypes:
 
-  extension::DriftChamberDigi:
+  extension::DriftChamberDigiLocal:
     Description: "Drift chamber digitized hit (before tracking) in local coordinates"
     Author: "B. Francois, CERN"
     Members:
@@ -21,13 +21,13 @@ datatypes:
       - float eDepError               // error measured on eDep [GeV].
       - uint32_t clusterCount         // number of clusters associated to this hit
 
-  extension::DriftChamberDigiLeftRightGlobal:
-    Description: "Drift chamber digitized hit (before tracking) in local coordinates"
+  extension::DriftChamberDigi:
+    Description: "Drift chamber digitized hit (before tracking) in global coordinates"
     Author: "B. Francois, CERN"
     Members:
       - uint64_t cellID               // ID of the wire that created this hit
-      - edm4hep::Vector3d leftPosition // position of the hit assuming it was on the left side of the wire [mm]
-      - edm4hep::Vector3d rightPosition // position of the hit assuming it was on the right side of the wire [mm]
+      - edm4hep::Vector3d leftPosition // position of the hit assuming it was on the left side of the wire, radially in the middle of the cell [mm]
+      - edm4hep::Vector3d rightPosition // position of the hit assuming it was on the right side of the wire, radially in the middle of the cell [mm]
       - float time                    // time of the hit [ns].
       - float eDep                    // energy deposited on the hit [GeV].
       - float eDepError               // error measured on eDep [GeV].

diff --git a/DCHdigi/include/DCHsimpleDigitizerExtendedEdm.h b/DCHdigi/include/DCHsimpleDigitizerExtendedEdm.h
@@ -14,7 +14,7 @@
 #include "edm4hep/SimTrackerHitCollection.h"
 
 // EDM4HEP extension
-#include "extension/DriftChamberDigiLeftRightGlobalCollection.h"
+#include "extension/DriftChamberDigiCollection.h"
 
 // DD4HEP
 #include "DD4hep/Detector.h"  // for dd4hep::VolumeManager
@@ -51,7 +51,7 @@ class DCHsimpleDigitizerExtendedEdm : public GaudiAlgorithm {
   // Input sim tracker hit collection name
   DataHandle<edm4hep::SimTrackerHitCollection> m_input_sim_hits{"inputSimHits", Gaudi::DataHandle::Reader, this};
   // Output digitized tracker hit collection name
-  DataHandle<extension::DriftChamberDigiLeftRightGlobalCollection> m_output_digi_hits{"outputDigiHits", Gaudi::DataHandle::Writer, this};
+  DataHandle<extension::DriftChamberDigiCollection> m_output_digi_hits{"outputDigiHits", Gaudi::DataHandle::Writer, this};
 
   // Detector readout name
   Gaudi::Property<std::string> m_readoutName{this, "readoutName", "CDCHHits", "Name of the detector readout"};

diff --git a/DCHdigi/src/DCHsimpleDigitizerExtendedEdm.cpp b/DCHdigi/src/DCHsimpleDigitizerExtendedEdm.cpp
@@ -51,7 +51,7 @@ StatusCode DCHsimpleDigitizerExtendedEdm::execute() {
   debug() << "Input Sim Hit collection size: " << input_sim_hits->size() << endmsg;
 
   // Digitize the sim hits
-  extension::DriftChamberDigiLeftRightGlobalCollection* output_digi_hits = m_output_digi_hits.createAndPut();
+  extension::DriftChamberDigiCollection* output_digi_hits = m_output_digi_hits.createAndPut();
   for (const auto& input_sim_hit : *input_sim_hits) {
     auto output_digi_hit = output_digi_hits->create();
     // smear the hit position: need to go in the wire local frame to smear in the direction aligned/perpendicular with the wire for z/distanceToWire, taking e.g. stereo angle into account