Muon system fixes (#59)

* Fix muon system material * Muon system readout can have negative phi index * Remove try catch
HEP-FCC · Sep 1, 2023 · 7d4bd98 · 7d4bd98
1 parent 6691b38
commit 7d4bd98
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/Detector/DetCommon/src/SimpleSensitiveLayeredCylinder_geo.cpp b/Detector/DetCommon/src/SimpleSensitiveLayeredCylinder_geo.cpp
@@ -52,13 +52,8 @@ static dd4hep::Ref_t createSimpleSensitiveLayeredCylinder_o1_v00(dd4hep::Detecto
       dd4hep::xml::Dimension sdType(xmlElement.child(_U(sensitive)));// if called outside of the loop it breaks existing configs without sensitive layers
       sensDet.setType(sdType.typeStr());
       layerVolume.setSensitiveDetector(sensDet);
-      try {
-         layerPlacedVolume.addPhysVolID("layer", sensitiveLayerIndex);
-         sensitiveLayerIndex++;
-       }
-      catch (...) {
-        std::cout << "Error: you must include a field 'layer' in your readout. \n";
-             }
+      layerPlacedVolume.addPhysVolID("layer", sensitiveLayerIndex);
+      sensitiveLayerIndex++;
     }
     layer.m_node = layers.next();
   }

diff --git a/Detector/DetFCCeeIDEA/compact/IDEA_o1_v01/MuonSystem.xml b/Detector/DetFCCeeIDEA/compact/IDEA_o1_v01/MuonSystem.xml
@@ -47,17 +47,17 @@
   <readouts>
     <readout name="MuonChamberBarrelReadout"> 
       <segmentation type="ProjectiveCylinder" phi_bins="3066" theta_bins="900"/>   <!-- Depending on cell size 1cm*1cm  -->
-      <id>system:4,layer:2,theta:10,phi:12</id>
+      <id>system:4,layer:2,theta:10,phi:-12</id>
     </readout>
 
     <readout name="MuonChamberPositiveEndcapReadout">
       <segmentation type="ProjectiveCylinder" phi_bins="1500" theta_bins="900"/>
-      <id>system:4,layer:2,theta:10,phi:11</id>
+      <id>system:4,layer:2,theta:10,phi:-11</id>
     </readout>
 
     <readout name="MuonChamberNegativeEndcapReadout">
       <segmentation type="ProjectiveCylinder" phi_bins="1500" theta_bins="900"/>
-      <id>system:4,layer:2,theta:10,phi:11</id>
+      <id>system:4,layer:2,theta:10,phi:-11</id>
     </readout>
   </readouts>
 
@@ -127,7 +127,7 @@
 
 
     <!-- Positve E n d C a p - -->
-    <detector name="PositiveMuonEndcap" type="SimpleSensitiveLayeredCylinder_o1_v00"  vis="MuonVisEnv" id="42" readout="MuonChamberPositiveEndcapReadout">
+    <detector name="MuonPositiveEndcap" type="SimpleSensitiveLayeredCylinder_o1_v00"  vis="MuonVisEnv" id="42" readout="MuonChamberPositiveEndcapReadout">
       <sensitive type="SimpleTrackerSD"/>
       <dimensions rmin="EndcapInnerRadius" rmax="EndcapOuterRadius" dz="EndcapLength/2.0" z_offset="EndcapZOffset" material="Air"/>
       <!-- 1st Endcap mRWELL layer -->
@@ -183,7 +183,7 @@
 
 
     <!-- Negative E n d C a p -->
-    <detector name="NegativeMuonEndcap" type="SimpleSensitiveLayeredCylinder_o1_v00"  vis="MuonVisEnv" id="43" readout="MuonChamberNegativeEndcapReadout">
+    <detector name="MuonNegativeEndcap" type="SimpleSensitiveLayeredCylinder_o1_v00"  vis="MuonVisEnv" id="43" readout="MuonChamberNegativeEndcapReadout">
       <sensitive type="SimpleTrackerSD"/>
       <dimensions rmin="EndcapInnerRadius" rmax="EndcapOuterRadius" dz="EndcapLength/2.0" z_offset="-EndcapZOffset" material="Air"/>
 

diff --git a/Detector/DetFCCeeIDEA/compact/IDEA_o1_v01/materials.xml b/Detector/DetFCCeeIDEA/compact/IDEA_o1_v01/materials.xml
@@ -358,8 +358,8 @@
 
   <material name="CF4" formula="CF4" state="gas">
     <D value="0.00372" unit="g/cm3" />
-    <fraction n="1" ref="C"/>
-    <fraction n="4" ref="F"/>
+    <composite n="1" ref="C"/>
+    <composite n="4" ref="F"/>
   </material>
 
   <material name="ARCO2CF4" state="gas">