From f3d3f30f1c92533e1618ef23dd2baed240cec86f Mon Sep 17 00:00:00 2001
From: Chao Peng <cpeng@anl.gov>
Date: Tue, 11 Jun 2024 13:38:11 -0500
Subject: [PATCH] update GEM, adding GEM into solid.xml
---
compact/GEM_sidis.xml | 2 +-
solid.xml | 1 +
src/{GEMTrackerDiscSOLID_geo.cpp => GEMTrackerDisc_geo.cpp} | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
rename src/{GEMTrackerDiscSOLID_geo.cpp => GEMTrackerDisc_geo.cpp} (94%)
diff --git a/compact/GEM_sidis.xml b/compact/GEM_sidis.xml
index 5150075..94238bf 100644
--- a/compact/GEM_sidis.xml
+++ b/compact/GEM_sidis.xml
@@ -1,6 +1,6 @@
<lccdd>
<detectors>
- <detector id="2" name="GEMTracker_SIDIS" vis="RedVis" type="GaplessGEMTrackerDisc" readout="GEMTrackerHits" >
+ <detector id="2" name="GEMTracker_SIDIS" vis="RedVis" type="SoLID_GEMTrackerDisc" readout="GEMTrackerHits" >
<module name="Module_A" id="1" inner_r="50.0*cm" outer_r="118.0*cm" segments="30">
<slice name="drift_cathode" material="Kapton" thickness="0.100*mm"/>
<slice name="drift_gas1" material="GEMGas" thickness="3.0*mm"/>
diff --git a/solid.xml b/solid.xml
index 775706c..31368d8 100644
--- a/solid.xml
+++ b/solid.xml
@@ -64,6 +64,7 @@
<!--<include ref="compact/LAEC.xml"/>
<include ref="compact/FAEC.xml"/>-->
<include ref="compact/LGC.xml"/>
+ <include ref="compact/GEM_sidis.xml"/>
</detectors>
<!-- Definition of the readout segmentation/definition -->
diff --git a/src/GEMTrackerDiscSOLID_geo.cpp b/src/GEMTrackerDisc_geo.cpp
similarity index 94%
rename from src/GEMTrackerDiscSOLID_geo.cpp
rename to src/GEMTrackerDisc_geo.cpp
index efee6ee..fc733c3 100644
--- a/src/GEMTrackerDiscSOLID_geo.cpp
+++ b/src/GEMTrackerDisc_geo.cpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright (C) 2024 Chao Peng, Whitney Armstrong
+
#include "DD4hep/DetFactoryHelper.h"
#include "DD4hep/Printout.h"
#include "TMath.h"
@@ -79,4 +82,4 @@ static Ref_t create_detector(Detector& lcdd, xml_h e, SensitiveDetector sens)
return sdet;
}
-DECLARE_DETELEMENT(GEMTrackerDiscSOLID,create_detector)
+DECLARE_DETELEMENT(SoLID_GEMTrackerDisc, create_detector)
--
GitLab