main-BCMPrime_introduction-SimuJobTransforms

main-BCMPrime_introduction-SimuJobTransforms

InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeDetectorTool.cxx

@@ -48,18 +48,17 @@ StatusCode BCMPrimeDetectorTool::create()
   // The & takes the address of the GeoVPhysVol
   GeoPhysVol *world = &*theExpt->getPhysVol();
   auto *manager = new InDetDD::BCMPrimeDetectorManager(m_detectorName);
-
   InDetDD::BCMPrimeGmxInterface gmxInterface(manager);
 
   // Load the geometry, create the volume, 
   // node,table are the location in the DB to look for the clob
   // empty strings are the (optional) containing detector and envelope names
   // allowed to pass a null sqlreader ptr - it will be used to steer the source of the geometry
-  const GeoVPhysVol* topVolume = createTopVolume(world, gmxInterface, node, table,"","",sqlreader);
+  const GeoVPhysVol* topVolume = createTopVolume(world, gmxInterface, node, table,"ITkPixel","ITkPixelDetector",sqlreader);
   if (topVolume) { //see that a valid pointer is returned
     manager->addTreeTop(topVolume);
   } else {
-    ATH_MSG_FATAL("Could not find the Top Volume!!!");
+    ATH_MSG_FATAL("Could not find the BCMPrime Top Volume!!!");
     return StatusCode::FAILURE;
   }
 

InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/GeoModelXmlTool.cxx

@@ -120,6 +120,7 @@ void GeoModelXmlTool::createVolume(GeoPhysVol* world, GmxInterface& gmxInterface
   } else {
     flags = 0;
     gmxInput = PathResolver::find_file(m_gmxFilename, "DATAPATH");
+    ATH_MSG_INFO("Getting " << m_detectorName.value() << " GeoModelXml description from file "<<gmxInput);
     if (gmxInput.empty()) { // File not found
       std::string errMessage("GeoModelXmlTool::createTopVolume: Unable to find file " + m_gmxFilename +
                              " with PathResolver; check filename and DATAPATH environment variable");

Simulation/G4Atlas/G4AtlasTools/python/G4GeometryToolConfig.py

@@ -77,6 +77,15 @@ def PLRGeoDetectorToolCfg(flags, name='PLR', **kwargs):
     kwargs.setdefault("DetectorName", "PLR")
     result.setPrivateTools(result.popToolsAndMerge(GeoDetectorToolCfg(flags, name, **kwargs)))
     return result
+    
+
+def BCMPrimeGeoDetectorToolCfg(flags, name='BCMPrime', **kwargs):
+    #set up geometry
+    from BCMPrimeGeoModelXml.BCMPrimeGeoModelConfig import BCMPrimeGeometryCfg
+    result = BCMPrimeGeometryCfg(flags)
+    kwargs.setdefault("DetectorName", "BCMPrime")
+    result.setPrivateTools(result.popToolsAndMerge(GeoDetectorToolCfg(flags, name, **kwargs)))
+    return result
 
 
 def ITkPixelGeoDetectorToolCfg(flags, name='ITkPixel', **kwargs):
@@ -237,6 +246,9 @@ def ITKEnvelopeCfg(flags, name="ITK", **kwargs):
     if flags.Detector.GeometryPLR:
         toolPLR = result.popToolsAndMerge(PLRGeoDetectorToolCfg(flags))
         SubDetectorList += [toolPLR]
+    if flags.Detector.GeometryBCMPrime:
+        toolBCMPrime = result.popToolsAndMerge(BCMPrimeGeoDetectorToolCfg(flags))
+        SubDetectorList += [toolBCMPrime]
     # TODO: for now HGTD is also here
     if flags.Detector.GeometryHGTD:
         toolHGTD = result.popToolsAndMerge(HGTDGeoDetectorToolCfg(flags))

Simulation/SimuJobTransforms/python/ReSimInputConfig.py

@@ -19,7 +19,7 @@ def RenameHitCollectionsOnReadCfg(flags):
         if flags.Detector.EnableTRT:
             result.merge(InputRenameCfg("TRTUncompressedHitCollection","TRTUncompressedHits","TRTUncompressedHitsOLD"))
         if flags.Detector.EnableBCMPrime:
-            pass #TODO
+            result.merge(InputRenameCfg("SiHitCollection","BCMPrimeHits","BCMPrimeHitsOLD"))
         if flags.Detector.EnableITkPixel:
             result.merge(InputRenameCfg("SiHitCollection","ITkPixelHits","ITkPixelHitsOLD"))
         if flags.Detector.EnableITkStrip:

Simulation/Tools/HitAnalysis/python/HitAnalysisConfig.py

@@ -135,6 +135,20 @@ def PLR_HitAnalysisCfg(flags, name='PLR_HitAnalysis', **kwargs):
     acc.merge(HitAnalysisOutputCfg(flags))
 
     return acc
+    
+
+def BCMPrimeHitAnalysisCfg(flags, name='BCMPrimeHitAnalysis', **kwargs):
+    from BCMPrimeGeoModelXml.BCMPrimeGeoModelConfig import BCMPrimeGeometryCfg
+    acc = BCMPrimeGeometryCfg(flags)
+
+    kwargs.setdefault('CollectionName', 'BCMPrimeHits')
+    kwargs.setdefault('HistPath', '/SiHitAnalysis/histos/')
+    kwargs.setdefault('NtuplePath', '/SiHitAnalysis/ntuples/')
+    acc.addEventAlgo(CompFactory.SiHitAnalysis(name, **kwargs))
+
+    acc.merge(HitAnalysisOutputCfg(flags))
+
+    return acc
 
 
 def SiHitAnalysisCfg(flags):
@@ -151,6 +165,9 @@ def SiHitAnalysisCfg(flags):
 
     if flags.Detector.EnablePLR:
         acc.merge(PLR_HitAnalysisCfg(flags))
+        
+    if flags.Detector.EnableBCMPrime:
+        acc.merge(BCMPrimeHitAnalysisCfg(flags))
 
     return acc