removed forward carriage from gcards

maureeungaro · Oct 23, 2024 · 5020cff · 5020cff
1 parent 04c2947
commit 5020cff
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 151 deletions.
diff --git a/gemc/dev/clas12-default.gcard b/gemc/dev/clas12-default.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bstShield/bstShield"   factory="TEXT" variation="w51"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ctof/javacad_default/"         factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOn is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOn"/>
 	<detector name="experiments/clas12/beamline/cadBeamline/"      factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOn"/>
-
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="default"/>

diff --git a/gemc/dev/rga_fall2018.gcard b/gemc/dev/rga_fall2018.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bstShield/bstShield"   factory="TEXT" variation="w51"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOn is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOn"/>
 	<detector name="experiments/clas12/beamline/cadBeamline/"      factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOn"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rga_fall2018_target_at_m3.5.gcard b/gemc/dev/rga_fall2018_target_at_m3.5.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bstShield/bstShield"   factory="TEXT" variation="w51"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOn is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOn"/>
 	<detector name="experiments/clas12/beamline/cadBeamline/"      factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOn"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rga_spring2018.gcard b/gemc/dev/rga_spring2018.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bstShield/bstShield"   factory="TEXT" variation="w51"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_spring2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_spring2018/"  factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOn is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOn"/>
 	<detector name="experiments/clas12/beamline/cadBeamline/"      factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOn"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rga_spring2019.gcard b/gemc/dev/rga_spring2019.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bstShield/bstShield"   factory="TEXT" variation="w51"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOn is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOn"/>
 	<detector name="experiments/clas12/beamline/cadBeamline/"      factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOn"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rgb_fall2019.gcard b/gemc/dev/rgb_fall2019.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bstShield/bstShield"   factory="TEXT" variation="w51"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOn is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOn"/>
 	<detector name="experiments/clas12/beamline/cadBeamline/"      factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOn"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rgb_spring2019.gcard b/gemc/dev/rgb_spring2019.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bstShield/bstShield"   factory="TEXT" variation="w51"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOn is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOn"/>
 	<detector name="experiments/clas12/beamline/cadBeamline/"      factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOn"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rgc_fall2022.gcard b/gemc/dev/rgc_fall2022.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bst/bst"               factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,18 +26,12 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: ELMO is used -->
 	<detector name="experiments/clas12/beamline/cadBeamlineELMO/" factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"         factory="TEXT" variation="ELMO"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rgc_summer2022.gcard b/gemc/dev/rgc_summer2022.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bst/bst"               factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FT is used -->
 	<detector name="experiments/clas12/ft/ft"                 factory="TEXT" variation="FTOn"/>
 	<detector name="experiments/clas12/beamline/cadBeamline/" factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"     factory="TEXT" variation="FTOn"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rgf_spring2020.gcard b/gemc/dev/rgf_spring2020.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/rtpc/rtpc"             factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="rgf_spring2020"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOff is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOff"/>
 	<detector name="experiments/clas12/beamline/cadBeamlineFTOFF/" factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOff"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rgk_fall2018_FTOff.gcard b/gemc/dev/rgk_fall2018_FTOff.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bstShield/bstShield"   factory="TEXT" variation="w51"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,18 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOff is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOff"/>
 	<detector name="experiments/clas12/beamline/cadBeamlineFTOFF/" factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOff"/>
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>

diff --git a/gemc/dev/rgk_fall2018_FTOn.gcard b/gemc/dev/rgk_fall2018_FTOn.gcard
@@ -13,7 +13,7 @@
 	<detector name="experiments/clas12/bstShield/bstShield"   factory="TEXT" variation="w51"/>
 	<detector name="experiments/clas12/micromegas/micromegas" factory="TEXT" variation="michel"/>
 
-	<!--ctof, cad  -->
+	<!--ctof, cnd  -->
 	<detector name="experiments/clas12/ctof/ctof"                     factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ctof/javacad_rga_fall2018/"    factory="CAD"/>
 	<detector name="experiments/clas12/cnd/cnd"                       factory="TEXT" variation="original"/>
@@ -26,19 +26,13 @@
 	<detector name="experiments/clas12/magnets/solenoid" factory="TEXT" variation="original"/>
 	<detector name="experiments/clas12/magnets/cad/"     factory="CAD" />
 
-
 	<!-- Beamline configuration: FTOn is used -->
 	<detector name="experiments/clas12/ft/ft"                      factory="TEXT" variation="FTOn"/>
 	<detector name="experiments/clas12/beamline/cadBeamline/"      factory="CAD"/>
 	<detector name="experiments/clas12/beamline/beamline"          factory="TEXT" variation="FTOn"/>
-
-
-	<!-- Downstream beamline configuration -->
 	<detector name="experiments/clas12/beamline/cad_downstream_beamline/" factory="CAD"/>
 
-	<!-- forward carriage -->
-	<detector name="experiments/clas12/fc/forwardCarriage" factory="TEXT" variation="default"/>
-
+	<!-- Detectors in the forward carriage -->
 	<detector name="experiments/clas12/dc/dc"                    factory="TEXT" variation="default"/>
 	<detector name="experiments/clas12/ftof/ftof"                factory="TEXT" variation="rga_fall2018"/>
 	<detector name="experiments/clas12/ec/ec"                    factory="TEXT" variation="rga_fall2018"/>