Update EMCal and add EMCal into solid.xml

compact/FAEC.xml

@@ -8,7 +8,7 @@
       <comment>Forward Angle Electromagnetic Calorimeter (FAEC) for SIDIS</comment>
   -->
   <detectors>
-    <detector id="5" name="FAECPreShower" type="EMCalorimeterSoLID" readout="FAEC_PrShHits" vis="PurpleVis" >
+    <detector id="5" name="FAECPreShower" type="SoLID_HexShashlykEMCal" readout="FAEC_PrShHits" vis="PurpleVis" >
       <dimensions rmin="98*cm" rmax="230*cm" z0="425*cm" rmod="6.25*cm" rtol="1.0*cm" />
       <layer repeat="1" vis="PurpleVis">
         <slice material = "Lead"  thickness = "1.12*cm" vis="BlueVis"  />
@@ -16,7 +16,7 @@
       </layer>
     </detector>
 
-    <detector id="6" name="FAECShower" type="EMCalorimeterSoLID" readout="FAEC_ShHits" vis="PurpleVis" >
+    <detector id="6" name="FAECShower" type="SoLID_HexShashlykEMCal" readout="FAEC_ShHits" vis="PurpleVis" >
       <dimensions rmin="98*cm" rmax="230*cm" z0="433*cm" rmod="6.25*cm" rtol="1.0*cm" />
       <layer repeat="194" vis="GreenVis">
         <slice material = "Lead"  vis="BlueVis"   thickness = "0.05*cm"/>

compact/LAEC.xml

@@ -4,7 +4,7 @@
 </define>
 
 <detectors>
-<detector id="3" name="LAECPreShower" type="EMCalorimeterSoLID" readout="LAEC_PrShHits" vis="PurpleVis" >
+<detector id="3" name="LAECPreShower" type="SoLID_HexShashlykEMCal" readout="LAEC_PrShHits" vis="PurpleVis" >
   <comment>Large Angle Electromagnetic Calorimeter (LAEC) Preshower for SIDIS</comment>
   <dimensions rmin="83*cm" rmax="140*cm" z0="-65*cm" rmod="6.25*cm" rtol="1.0*cm" />
   <layer repeat="1" vis="InvisibleWithDaughters">
@@ -13,7 +13,7 @@
   </layer>
 </detector>
 
-<detector id="4" name="LAECShower" type="EMCalorimeterSoLID" readout="LAEC_ShHits" vis="PurpleVis" >
+<detector id="4" name="LAECShower" type="SoLID_HexShashlykEMCal" readout="LAEC_ShHits" vis="PurpleVis" >
   <comment>Large Angle Electromagnetic Calorimeter (LAEC) Shower for SIDIS</comment>
   <dimensions rmin="83*cm" rmax="140*cm" z0="-57*cm" rmod="6.25*cm" rtol="1.0*cm" />
   <layer repeat="194" vis="GreenVis">

solid.xml

@@ -61,8 +61,8 @@
       <!--<include ref="compact/fields.xml"/>-->
 
   <detectors>
-    <!--<include ref="compact/LAEC.xml"/>
-    <include ref="compact/FAEC.xml"/>-->
+    <include ref="compact/LAEC.xml"/>
+    <include ref="compact/FAEC.xml"/>
     <include ref="compact/LGC.xml"/>
     <include ref="compact/GEM_sidis.xml"/>
   </detectors>

src/EMCalorimeterSOLID_geo.cpp → src/HexShashlykEMCal_geo.cpp

@@ -196,5 +196,5 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
     return sdet;
 }
 
-DECLARE_DETELEMENT(EMCalorimeterSoLID, createDetector)
+DECLARE_DETELEMENT(SoLID_HexShashlykEMCal, createDetector)