Merge pull request #34401 from bsunanda/Run4-hgx288

Run4-hgx288 Make V16 of HGCAl ready for the SIM step

Geometry/HGCalCommonData/python/testHGCV15XML_cfi.py

@@ -45,16 +45,40 @@
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2026/v7/mf.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
+        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml',
+        'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv15.xml',
+        'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/HcalSimData/data/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
         'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml'
     ),
     rootNodeName = cms.string('cms:OCMS')

Geometry/HGCalCommonData/python/testHGCV16XML_cfi.py

@@ -33,19 +33,45 @@
         'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
         'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v1/brm.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2026/v7/mf.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
+        'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml',
+        'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
+        'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
         'Geometry/HcalSimData/data/HcalProdCuts.xml',
         'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
         'Geometry/CMSCommonData/data/FieldParameters.xml'
     ),
     rootNodeName = cms.string('cms:OCMS')

Geometry/HGCalCommonData/python/testHGCalV14XML_cfi.py

@@ -52,23 +52,23 @@
         'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
         'Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2026/v7/mf.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v6/mf.xml',
         'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v4/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml',
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml',
+        'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
+        'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',

Geometry/HGCalCommonData/python/testHGCalV15XML_cfi.py

@@ -60,7 +60,7 @@
         'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
         'Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml',
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',

Geometry/HGCalCommonData/python/testHGCalV16XML_cfi.py

@@ -61,14 +61,14 @@
         'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml',
         'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
         'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml',
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
+        'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

@@ -134,8 +134,9 @@ std::pair<int, int> HGCalDDDConstants::assignCell(float x, float y, int lay, int
       return std::make_pair(-1, -1);
     } else {
       // Now the cell
-      xx -= hgpar_->waferPosX_[wafer];
-      yy -= hgpar_->waferPosY_[wafer];
+      std::pair<double, double> xy = getXY(lay, xx, yy, false);
+      xx = xy.first - hgpar_->waferPosX_[wafer];
+      yy = xy.second - hgpar_->waferPosY_[wafer];
       if (hgpar_->waferTypeT_[wafer] == 1)
         return std::make_pair(wafer,
                               cellHex(xx,
@@ -620,7 +621,7 @@ std::pair<float, float> HGCalDDDConstants::locateCell(int cell, int lay, int typ
       y *= HGCalParameters::k_ScaleToDDD;
     }
   }
-  return std::make_pair(x, y);
+  return getXY(lay, x, y, true);
 }
 
 std::pair<float, float> HGCalDDDConstants::locateCell(
@@ -672,7 +673,7 @@ std::pair<float, float> HGCalDDDConstants::locateCell(
       edm::LogVerbatim("HGCalGeom") << "With wafer " << x << ":" << y << ":" << xy.first << ":" << xy.second;
 #endif
   }
-  return std::make_pair(x, y);
+  return getXY(lay, x, y, true);
 }
 
 std::pair<float, float> HGCalDDDConstants::locateCell(const HGCSiliconDetId& id, bool debug) const {
@@ -696,7 +697,8 @@ std::pair<float, float> HGCalDDDConstants::locateCell(const HGCSiliconDetId& id,
     edm::LogVerbatim("HGCalGeom") << "LocateCell r1:R1 " << r1 << ":" << R1 << " dx:dy "
                                   << ((1.5 * (id.cellV() - ncells) + 1.0) * R1) << ":"
                                   << ((id.cellU() - 0.5 * id.cellV() - n2) * 2 * r1) << " Pos " << xpos << ":" << ypos;
-  return std::make_pair(xpos * id.zside(), ypos);
+  std::pair<double, double> xy = getXY(id.layer(), xpos, ypos, true);
+  return std::make_pair(xy.first * id.zside(), xy.second);
 }
 
 std::pair<float, float> HGCalDDDConstants::locateCell(const HGCScintillatorDetId& id, bool debug) const {
@@ -1088,7 +1090,7 @@ void HGCalDDDConstants::waferFromPosition(const double x, const double y, int& w
   // Input x, y in Geant4 unit and transformed to CMSSW standard
   double xx = HGCalParameters::k_ScaleFromDDD * x;
   double yy = HGCalParameters::k_ScaleFromDDD * y;
-  int size_ = (int)(hgpar_->waferCopy_.size());
+  int size_ = static_cast<int>(hgpar_->waferCopy_.size());
   wafer = size_;
   for (int k = 0; k < size_; ++k) {
     double dx = std::abs(xx - hgpar_->waferPosX_[k]);
@@ -1141,8 +1143,10 @@ void HGCalDDDConstants::waferFromPosition(const double x,
   if ((hgpar_->xLayerHex_.empty()) || (hgpar_->yLayerHex_.empty()))
     return;
   int ll = layer - hgpar_->firstLayer_;
-  double xx = HGCalParameters::k_ScaleFromDDD * x - hgpar_->xLayerHex_[ll];
-  double yy = HGCalParameters::k_ScaleFromDDD * y - hgpar_->yLayerHex_[ll];
+  std::pair<double, double> xy =
+      getXY(layer, HGCalParameters::k_ScaleFromDDD * x, HGCalParameters::k_ScaleFromDDD * y, false);
+  double xx = xy.first - hgpar_->xLayerHex_[ll];
+  double yy = xy.second - hgpar_->yLayerHex_[ll];
   for (unsigned int k = 0; k < hgpar_->waferPosX_.size(); ++k) {
     double dx = std::abs(xx - hgpar_->waferPosX_[k]);
     double dy = std::abs(yy - hgpar_->waferPosY_[k]);

SimG4CMS/Calo/interface/HGCalNumberingScheme.h

@@ -24,7 +24,7 @@ class HGCalNumberingScheme {
   uint32_t getUnitID(int layer, int module, int cell, int iz, const G4ThreeVector& pos, double& wt);
 
 private:
-  void checkPosition(uint32_t index, const G4ThreeVector& pos) const;
+  void checkPosition(uint32_t index, const G4ThreeVector& pos, bool matchOnly, bool debug) const;
 
   HGCalNumberingScheme() = delete;
   const HGCalDDDConstants& hgcons_;

SimG4CMS/Calo/src/HGCalNumberingScheme.cc

@@ -17,7 +17,11 @@ HGCalNumberingScheme::HGCalNumberingScheme(const HGCalDDDConstants& hgc,
                                            const std::string& name)
     : hgcons_(hgc), mode_(hgc.geomMode()), det_(det), name_(name) {
 #ifdef EDM_ML_DEBUG
-  edm::LogVerbatim("HGCSim") << "Creating HGCalNumberingScheme for " << name_ << " Det " << det_;
+  edm::LogVerbatim("HGCSim") << "Creating HGCalNumberingScheme for " << name_ << " Det " << det_ << " Mode " << mode_
+                             << ":" << HGCalGeometryMode::Hexagon8Full << ":" << HGCalGeometryMode::Hexagon8 << ":"
+                             << HGCalGeometryMode::Hexagon8File << ":" << HGCalGeometryMode::Trapezoid << ":"
+                             << HGCalGeometryMode::TrapezoidFile << ":" << HGCalGeometryMode::Hexagon8Module << ":"
+                             << HGCalGeometryMode::TrapezoidModule;
 #endif
 }
 
@@ -33,10 +37,7 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz
   wt = 1.0;
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme:: input Layer " << layer << " Module " << module << " Cell "
-                             << cell << " iz " << iz << " Position " << pos << " Mode " << mode_ << ":"
-                             << HGCalGeometryMode::Hexagon8Full << ":" << HGCalGeometryMode::Hexagon8 << ":"
-                             << HGCalGeometryMode::Hexagon8File << ":" << HGCalGeometryMode::Trapezoid << ":"
-                             << HGCalGeometryMode::TrapezoidFile;
+                             << cell << " iz " << iz << " Position " << pos;
 #endif
   if (hgcons_.waferHexagon8()) {
     int cellU(0), cellV(0), waferType(-1), waferU(0), waferV(0);
@@ -51,7 +52,7 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz
       hgcons_.waferFromPosition(xx, pos.y(), layer, waferU, waferV, cellU, cellV, waferType, wt);
     }
     if (waferType >= 0) {
-      if (mode_ == HGCalGeometryMode::Hexagon8File) {
+      if ((mode_ == HGCalGeometryMode::Hexagon8File) || (mode_ == HGCalGeometryMode::Hexagon8Module)) {
         int type = hgcons_.waferType(layer, waferU, waferV, true);
         if (type != waferType) {
 #ifdef EDM_ML_DEBUG
@@ -98,12 +99,14 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz
   edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme::i/p " << det_ << ":" << layer << ":" << module << ":" << cell
                              << ":" << iz << ":" << pos.x() << ":" << pos.y() << ":" << pos.z() << " ID " << std::hex
                              << index << std::dec << " wt " << wt;
-  checkPosition(index, pos);
+  bool matchOnly = (mode_ == HGCalGeometryMode::Hexagon8Module) ? true : false;
+  bool debug = (mode_ == HGCalGeometryMode::Hexagon8Module) ? true : false;
+  checkPosition(index, pos, matchOnly, debug);
 #endif
   return index;
 }
 
-void HGCalNumberingScheme::checkPosition(uint32_t index, const G4ThreeVector& pos) const {
+void HGCalNumberingScheme::checkPosition(uint32_t index, const G4ThreeVector& pos, bool matchOnly, bool debug) const {
   std::pair<float, float> xy;
   bool ok(false);
   double z1(0), tolR(12.0), tolZ(1.0);
@@ -139,7 +142,9 @@ void HGCalNumberingScheme::checkPosition(uint32_t index, const G4ThreeVector& po
                        (z1 > zrange.second + tolZ))
                           ? "***** ERROR *****"
                           : "");
-    if (!(match && inok && outok)) {
+    if (matchOnly && match)
+      ck = "";
+    if (!(match && inok && outok) || debug) {
       edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme::Detector " << det_ << " Layer " << lay << " R " << r2 << ":"
                                  << r1 << ":" << rrange.first << ":" << rrange.second << " Z " << z2 << ":" << z1 << ":"
                                  << zrange.first << ":" << zrange.second << " Match " << match << ":" << inok << ":"

SimG4CMS/Calo/test/python/runHGC1_cfg.py

@@ -1,54 +1,31 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
 
-process = cms.Process("PROD")
+process = cms.Process("PROD",Phase2C11)
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load('Configuration.StandardSequences.Generator_cff')
 process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
 process.load('GeneratorInterface.Core.genFilterSummary_cff')
 process.load('Configuration.StandardSequences.SimIdeal_cff')
-process.load("Geometry.HGCalCommonData.testHGCV8XML_cfi")
-process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi")
+process.load("Geometry.HGCalCommonData.testHGCV14XML_cfi")
+process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff")
 process.load("Geometry.EcalCommonData.ecalSimulationParameters_cff")
-process.load("Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi")
-process.load("Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi")
 process.load("Geometry.HcalCommonData.hcalDDDSimConstants_cff")
+process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
+process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
+process.load("Geometry.MuonNumbering.muonGeometryConstants_cff")
+process.load("Geometry.MuonNumbering.muonOffsetESProducer_cff")
+process.load("Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load("Configuration.EventContent.EventContent_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
-from Configuration.AlCa.autoCond import autoCond
-process.GlobalTag.globaltag = autoCond['run2_mc']
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
 
-process.MessageLogger = cms.Service("MessageLogger",
-    cerr = cms.untracked.PSet(
-        enable = cms.untracked.bool(False)
-    ),
-    cout = cms.untracked.PSet(
-        CaloSim = cms.untracked.PSet(
-            limit = cms.untracked.int32(0)
-        ),
-        DEBUG = cms.untracked.PSet(
-            limit = cms.untracked.int32(0)
-        ),
-        G4cerr = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        ),
-        G4cout = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        ),
-        HGCSim = cms.untracked.PSet(
-            limit = cms.untracked.int32(0)
-        ),
-        HGCalGeom = cms.untracked.PSet(
-            limit = cms.untracked.int32(0)
-        ),
-        INFO = cms.untracked.PSet(
-            limit = cms.untracked.int32(0)
-        ),
-        enable = cms.untracked.bool(True),
-        threshold = cms.untracked.string('DEBUG')
-    ),
-    debugModules = cms.untracked.vstring('*')
-)
+if hasattr(process,'MessageLogger'):
+    process.MessageLogger.G4cout = dict()
+    process.MessageLogger.G4cerr = dict()
+    process.MessageLogger.HGCSim = dict()
 
 process.load("IOMC.RandomEngine.IOMC_cff")
 process.RandomNumberGeneratorService.generator.initialSeed = 456789
@@ -82,7 +59,7 @@
 
 process.output = cms.OutputModule("PoolOutputModule",
     process.FEVTSIMEventContent,
-    fileName = cms.untracked.string('simevent.root')
+    fileName = cms.untracked.string('hgcV14.root')
 )
 
 process.generation_step = cms.Path(process.pgen)