diff --git a/Geometry/CaloTopology/src/HGCalTopology.cc b/Geometry/CaloTopology/src/HGCalTopology.cc index 7b50833773943..0750c02f9d7ef 100644 --- a/Geometry/CaloTopology/src/HGCalTopology.cc +++ b/Geometry/CaloTopology/src/HGCalTopology.cc @@ -471,7 +471,7 @@ bool HGCalTopology::valid(const DetId& idin) const { if (flag) flag = hdcons_.isValidHex(id.iLay, id.iSec1, id.iCell1, true); } else if (tileTrapezoid()) { - flag = ((idin.det() == det_) && hdcons_.isValidTrap(id.iLay, id.iSec1, id.iCell1)); + flag = ((idin.det() == det_) && hdcons_.isValidTrap(id.zSide, id.iLay, id.iSec1, id.iCell1)); } else { flag = ((idin.det() == det_) && hdcons_.isValidHex8(id.iLay, id.iSec1, id.iSec2, id.iCell1, id.iCell2)); } @@ -568,7 +568,7 @@ void HGCalTopology::addHGCSCintillatorId( edm::LogVerbatim("HGCalGeom") << "addHGCSCintillatorId " << zside << ":" << type << ":" << lay << ":" << iradius << ":" << iphi << " ==> Validity " << hdcons_.isValidTrap(lay, iradius, iphi); #endif - if (hdcons_.isValidTrap(lay, iradius, iphi)) { + if (hdcons_.isValidTrap(zside, lay, iradius, iphi)) { HGCScintillatorDetId id(type, lay, zside * iradius, iphi); ids.emplace_back(DetId(id)); } diff --git a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h index 3a837607e44e9..7e14735084d4a 100644 --- a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h +++ b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h @@ -81,7 +81,7 @@ class HGCalDDDConstants { bool isValidHex(int lay, int mod, int cell, bool reco) const; bool isValidHex8(int lay, int waferU, int waferV, bool fullAndPart = false) const; bool isValidHex8(int lay, int modU, int modV, int cellU, int cellV, bool fullAndPart = false) const; - bool isValidTrap(int lay, int ieta, int iphi) const; + bool isValidTrap(int zside, int lay, int ieta, int iphi) const; int lastLayer(bool reco) const; int layerIndex(int lay, bool reco) const; unsigned int layers(bool reco) const; diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc index d0e778cda05cf..42a9726103562 100644 --- a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc +++ b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc @@ -590,13 +590,14 @@ bool HGCalDDDConstants::isValidHex8(int layer, int modU, int modV, int cellU, in return isValidCell8(layer, modU, modV, cellU, cellV, type); } -bool HGCalDDDConstants::isValidTrap(int layer, int irad, int iphi) const { +bool HGCalDDDConstants::isValidTrap(int zside, int layer, int irad, int iphi) const { // Check validity for a layer|eta|phi of scintillator const auto& indx = getIndex(layer, true); if (indx.first < 0) return false; - return ((irad >= hgpar_->iradMinBH_[indx.first]) && (irad <= (hgpar_->iradMaxBH_[indx.first] + 1)) && (iphi > 0) && - (iphi <= hgpar_->scintCells(layer))); + bool ok = ((irad >= hgpar_->iradMinBH_[indx.first]) && (irad <= (hgpar_->iradMaxBH_[indx.first] + 1)) && (iphi > 0) && + (iphi <= hgpar_->scintCells(layer))); + return ((ok && trapezoidFile()) ? tileExist(zside, layer, irad, iphi) : ok); } int HGCalDDDConstants::lastLayer(bool reco) const { diff --git a/SimG4CMS/Calo/data/extraTiles.txt b/SimG4CMS/Calo/data/extraTiles.txt new file mode 100644 index 0000000000000..68a77649b1a52 --- /dev/null +++ b/SimG4CMS/Calo/data/extraTiles.txt @@ -0,0 +1,6 @@ +14 7 151 +15 7 152 +17 7 152 +17 7 154 +16 7 178 +16 7 225 diff --git a/SimG4CMS/Calo/data/missingWafers.txt b/SimG4CMS/Calo/data/missingWafers.txt index d5477cd2af4bc..0ce8867fb862d 100644 --- a/SimG4CMS/Calo/data/missingWafers.txt +++ b/SimG4CMS/Calo/data/missingWafers.txt @@ -1,28 +1,139 @@ -1,2,0 -1 1 -1 -1 0 -2 -1 -1 1 -1 5 10 -1 -2 8 -1 10 3 -1 -10 -4 -2 -2 0 -2 -2 -1 -2 1 2 -2 -10 -5 -2 5 10 -2 4 -6 -2 10 6 -5 0 2 -5 -2 -1 -5 -2 0 -5 5 10 -5 -2 8 -5 10 3 -5 -10 -4 -6 5 10 -6 -5 5 -6 -10 -6 -6 -5 -10 -6 10 5 -6 5 -5 + 1 2 0 + 1 1 -1 + 1 0 -2 + 1 -1 1 + 1 5 10 + 1 -2 8 + 1 10 3 + 1 -10 -4 + 2 -2 0 + 2 -2 -1 + 2 1 2 + 2 -10 -5 + 2 5 10 + 2 4 -6 + 2 10 6 + 5 0 2 + 5 -2 -1 + 5 -2 0 + 5 5 10 + 5 -2 8 + 5 10 3 + 5 -10 -4 + 6 5 10 + 6 -5 5 + 6 -10 -6 + 6 -5 -10 + 6 10 5 + 6 5 -5 +27 1 10 +27 -10 -9 +27 9 -1 +27 2 0 +27 0 2 +27 -2 -2 +27 2 2 +27 -2 0 +27 0 -2 +27 4 11 +27 -11 -7 +27 7 -4 +27 5 11 +27 -11 -6 +27 6 -5 +27 6 11 +27 -11 -5 +27 5 -6 +27 7 11 +27 -11 -4 +27 4 -7 +27 8 11 +27 -11 -3 +27 3 -8 +27 9 0 +27 0 9 +27 -9 -9 +27 9 9 +27 -9 0 +27 0 -9 +27 9 10 +27 -10 -1 +27 1 -9 +27 10 1 +27 -1 9 +27 -9 -10 +27 10 9 +27 -9 1 +27 -1 -10 +27 11 3 +27 -3 8 +27 -8 -11 +27 11 4 +27 -4 7 +27 -7 -11 +27 11 5 +27 -5 6 +27 -6 -11 +27 11 6 +27 -6 5 +27 -5 -11 +27 11 7 +27 -7 4 +27 -4 -11 +27 11 8 +27 -8 3 +27 -3 -11 +34 1 10 +34 -9 -8 +34 9 0 +34 2 4 +34 -3 -1 +34 2 -1 +34 3 1 +34 0 3 +34 -2 -2 +34 3 3 +34 -2 1 +34 0 -2 +34 3 11 +34 -10 -7 +34 8 -2 +34 4 11 +34 -10 -6 +34 7 -3 +34 5 11 +34 -10 -5 +34 6 -4 +34 6 11 +34 -10 -4 +34 5 -5 +34 7 11 +34 -10 -3 +34 4 -6 +34 8 11 +34 -10 -2 +34 3 -7 +34 9 10 +34 -9 0 +34 1 -8 +34 10 2 +34 -1 9 +34 -8 -9 +34 10 3 +34 -2 8 +34 -7 -9 +34 10 8 +34 -7 3 +34 -2 -9 +34 10 9 +34 -8 2 +34 -1 -9 +34 11 5 +34 -4 7 +34 -6 -10 +34 11 6 +34 -5 6 +34 -5 -10 +34 11 7 +34 -6 5 +34 -4 -10 diff --git a/SimG4CMS/Calo/data/missingWafersEE.txt b/SimG4CMS/Calo/data/missingWafersEE.txt new file mode 100644 index 0000000000000..cb9c23c4489a5 --- /dev/null +++ b/SimG4CMS/Calo/data/missingWafersEE.txt @@ -0,0 +1,28 @@ +1 2 0 +1 1 -1 +1 0 -2 +1 -1 1 +1 5 10 +1 -2 8 +1 10 3 +1 -10 -4 +2 -2 0 +2 -2 -1 +2 1 2 +2 -10 -5 +2 5 10 +2 4 -6 +2 10 6 +5 0 2 +5 -2 -1 +5 -2 0 +5 5 10 +5 -2 8 +5 10 3 +5 -10 -4 +6 5 10 +6 -5 5 +6 -10 -6 +6 -5 -10 +6 10 5 +6 5 -5 diff --git a/SimG4CMS/Calo/data/missingWafersHE.txt b/SimG4CMS/Calo/data/missingWafersHE.txt new file mode 100644 index 0000000000000..db4585ec8a7bc --- /dev/null +++ b/SimG4CMS/Calo/data/missingWafersHE.txt @@ -0,0 +1,172 @@ +27 1 10 +27 -10 -9 +27 9 -1 +27 2 0 +27 0 2 +27 -2 -2 +27 2 2 +27 -2 0 +27 0 -2 +27 4 11 +27 -11 -7 +27 7 -4 +27 5 11 +27 -11 -6 +27 6 -5 +27 6 11 +27 -11 -5 +27 5 -6 +27 7 11 +27 -11 -4 +27 4 -7 +27 8 11 +27 -11 -3 +27 3 -8 +27 9 0 +27 0 9 +27 -9 -9 +27 9 9 +27 -9 0 +27 0 -9 +27 9 10 +27 -10 -1 +27 1 -9 +27 10 1 +27 -1 9 +27 -9 -10 +27 10 9 +27 -9 1 +27 -1 -10 +27 11 3 +27 -3 8 +27 -8 -11 +27 11 4 +27 -4 7 +27 -7 -11 +27 11 5 +27 -5 6 +27 -6 -11 +27 11 6 +27 -6 5 +27 -5 -11 +27 11 7 +27 -7 4 +27 -4 -11 +27 11 8 +27 -8 3 +27 -3 -11 +28 1 10 +28 -10 -9 +28 9 -1 +28 2 0 +28 0 2 +28 -2 -2 +28 2 2 +28 -2 0 +28 0 -2 +28 3 11 +28 -11 -8 +28 8 -3 +28 4 11 +28 -11 -7 +28 7 -4 +28 5 11 +28 -11 -6 +28 6 -5 +28 6 11 +28 -11 -5 +28 5 -6 +28 7 11 +28 -11 -4 +28 4 -7 +28 8 11 +28 -11 -3 +28 3 -8 +28 9 0 +28 0 9 +28 -9 -9 +28 9 9 +28 -9 0 +28 0 -9 +28 9 10 +28 -10 -1 +28 1 -9 +28 10 1 +28 -1 9 +28 -9 -10 +28 10 9 +28 -9 1 +28 -1 -10 +28 11 3 +28 -3 8 +28 -8 -11 +28 11 4 +28 -4 7 +28 -7 -11 +28 11 5 +28 -5 6 +28 -6 -11 +28 11 6 +28 -6 5 +28 -5 -11 +28 11 7 +28 -7 4 +28 -4 -11 +28 11 8 +28 -8 3 +28 -3 -11 +34 1 10 +34 -9 -8 +34 9 0 +34 2 4 +34 -3 -1 +34 2 -1 +34 3 1 +34 0 3 +34 -2 -2 +34 3 3 +34 -2 1 +34 0 -2 +34 3 11 +34 -10 -7 +34 8 -2 +34 4 11 +34 -10 -6 +34 7 -3 +34 5 11 +34 -10 -5 +34 6 -4 +34 6 11 +34 -10 -4 +34 5 -5 +34 7 11 +34 -10 -3 +34 4 -6 +34 8 11 +34 -10 -2 +34 3 -7 +34 9 10 +34 -9 0 +34 1 -8 +34 10 2 +34 -1 9 +34 -8 -9 +34 10 3 +34 -2 8 +34 -7 -9 +34 10 8 +34 -7 3 +34 -2 -9 +34 10 9 +34 -8 2 +34 -1 -9 +34 11 5 +34 -4 7 +34 -6 -10 +34 11 6 +34 -5 6 +34 -5 -10 +34 11 7 +34 -6 5 +34 -4 -10 + diff --git a/SimG4CMS/Calo/interface/HGCalNumberingScheme.h b/SimG4CMS/Calo/interface/HGCalNumberingScheme.h index 3c8d3203c2c97..08fff124aa3f7 100644 --- a/SimG4CMS/Calo/interface/HGCalNumberingScheme.h +++ b/SimG4CMS/Calo/interface/HGCalNumberingScheme.h @@ -38,6 +38,7 @@ class HGCalNumberingScheme { const DetId::Detector det_; const std::string name_; int firstLayer_; + std::vector dumpDets_; std::vector indices_; }; diff --git a/SimG4CMS/Calo/plugins/HGCalTestPartialWaferHits.cc b/SimG4CMS/Calo/plugins/HGCalTestPartialWaferHits.cc index f1c7d25aa3e57..a3f0d6645df6d 100644 --- a/SimG4CMS/Calo/plugins/HGCalTestPartialWaferHits.cc +++ b/SimG4CMS/Calo/plugins/HGCalTestPartialWaferHits.cc @@ -44,6 +44,7 @@ class HGCalTestPartialWaferHits : public edm::one::EDAnalyzer<> { const edm::EDGetTokenT tok_calo_; const edm::ESGetToken geomToken_; std::vector wafers_; + std::vector dumpDets_; }; HGCalTestPartialWaferHits::HGCalTestPartialWaferHits(const edm::ParameterSet& ps) @@ -70,9 +71,14 @@ HGCalTestPartialWaferHits::HGCalTestPartialWaferHits(const edm::ParameterSet& ps int waferU = std::atoi(items[1].c_str()); int waferV = std::atoi(items[2].c_str()); wafers_.emplace_back(HGCalWaferIndex::waferIndex(layer, waferU, waferV, false)); + } else if (items.size() == 1) { + int dumpdet = std::atoi(items[0].c_str()); + dumpDets_.emplace_back(dumpdet); + edm::LogVerbatim("HGCSim") << nameSense_ << " Dump detector " << dumpdet; } } - edm::LogVerbatim("HGCalSim") << "Reads in " << wafers_.size() << " wafer information from " << fileName; + edm::LogVerbatim("HGCalSim") << "HGCalTestPartialWaferHits::Reads in " << wafers_.size() << ":" + << dumpDets_.size() << " wafer|detector information from " << fileName; fInput.close(); } } @@ -91,14 +97,14 @@ void HGCalTestPartialWaferHits::analyze(const edm::Event& e, const edm::EventSet // get hcalGeometry const HGCalGeometry* geom = &iS.getData(geomToken_); const HGCalDDDConstants& hgc = geom->topology().dddConstants(); - int firstLayer = hgc.firstLayer() - 1; + int firstLayer = hgc.getLayerOffset(); // get the hit collection const edm::Handle& hitsCalo = e.getHandle(tok_calo_); bool getHits = (hitsCalo.isValid()); uint32_t nhits = (getHits) ? hitsCalo->size() : 0; uint32_t good(0), allSi(0), all(0); edm::LogVerbatim("HGCalSim") << "HGCalTestPartialWaferHits: Input flags Hits " << getHits << " with " << nhits - << " hits first Layer " << firstLayer; + << " hits: Layer Offset " << firstLayer; if (getHits) { std::vector hits; @@ -117,6 +123,10 @@ void HGCalTestPartialWaferHits::analyze(const edm::Event& e, const edm::EventSet int indx = HGCalWaferIndex::waferIndex(firstLayer + hid.layer(), hid.waferU(), hid.waferV(), false); if (std::find(wafers_.begin(), wafers_.end(), indx) != wafers_.end()) toCheck = true; + } else if (!dumpDets_.empty()) { + if ((std::find(dumpDets_.begin(), dumpDets_.end(), static_cast(id.det())) != dumpDets_.end()) && + (info.part != HGCalTypes::WaferFull)) + toCheck = true; } else { // Only partial wafers toCheck = (info.part != HGCalTypes::WaferFull); diff --git a/SimG4CMS/Calo/plugins/HGCalTestScintHits.cc b/SimG4CMS/Calo/plugins/HGCalTestScintHits.cc index 2d1dfc1726712..6ec7018391f29 100644 --- a/SimG4CMS/Calo/plugins/HGCalTestScintHits.cc +++ b/SimG4CMS/Calo/plugins/HGCalTestScintHits.cc @@ -124,7 +124,7 @@ void HGCalTestScintHits::analyze(const edm::Event& e, const edm::EventSetup& iS) ++good; GlobalPoint pos = geom->getPosition(id); bool valid1 = geom->topology().valid(id); - bool valid2 = hgc.isValidTrap(hid.layer(), hid.ring(), hid.iphi()); + bool valid2 = hgc.isValidTrap(hid.zside(), hid.layer(), hid.ring(), hid.iphi()); edm::LogVerbatim("HGCalSim") << "Hit[" << all << ":" << good << "]" << hid << " at (" << pos.x() << ", " << pos.y() << ", " << pos.z() << ") Validity " << valid1 << ":" << valid2 << " Energy " << hit.energy() << " Time " << hit.time(); diff --git a/SimG4CMS/Calo/src/HGCalNumberingScheme.cc b/SimG4CMS/Calo/src/HGCalNumberingScheme.cc index d0d41c91577ac..034095d70fd17 100644 --- a/SimG4CMS/Calo/src/HGCalNumberingScheme.cc +++ b/SimG4CMS/Calo/src/HGCalNumberingScheme.cc @@ -9,6 +9,7 @@ #include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h" #include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h" #include "Geometry/HGCalCommonData/interface/HGCalTypes.h" +#include "Geometry/HGCalCommonData/interface/HGCalTileIndex.h" #include "Geometry/HGCalCommonData/interface/HGCalWaferIndex.h" #include #include @@ -29,7 +30,7 @@ HGCalNumberingScheme::HGCalNumberingScheme(const HGCalDDDConstants& hgc, << HGCalGeometryMode::TrapezoidFile << ":" << HGCalGeometryMode::TrapezoidModule << ":" << HGCalGeometryMode::TrapezoidCassette; #endif - firstLayer_ = hgcons_.firstLayer() - 1; + firstLayer_ = hgcons_.getLayerOffset(); if (!fileName.empty()) { edm::FileInPath filetmp1("SimG4CMS/Calo/data/" + fileName); std::string filetmp2 = filetmp1.fullPath(); @@ -52,9 +53,15 @@ HGCalNumberingScheme::HGCalNumberingScheme(const HGCalDDDConstants& hgc, int iphi = std::atoi(items[2].c_str()); indices_.emplace_back(HGCalTileIndex::tileIndex(layer, ring, iphi)); } + } else if (items.size() == 1) { + int dumpdet = std::atoi(items[0].c_str()); + dumpDets_.emplace_back(dumpdet); } } - edm::LogVerbatim("HGCalSim") << "Reads in " << indices_.size() << " component information from " << filetmp2; +#ifdef EDM_ML_DEBUG + edm::LogVerbatim("HGCalSim") << "Reads in " << indices_.size() << ":" << dumpDets_.size() + << " component information from " << filetmp2 << " Layer Offset " << firstLayer_; +#endif fInput.close(); } } @@ -84,12 +91,19 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz cellV = HGCalTypes::getUnpackedCellV(cell); } else if (mode_ != HGCalGeometryMode::Hexagon8) { double xx = (pos.z() > 0) ? pos.x() : -pos.x(); + int wU = HGCalTypes::getUnpackedU(module); + int wV = HGCalTypes::getUnpackedV(module); bool debug(false); if (!indices_.empty()) { - int indx = HGCalWaferIndex::waferIndex(firstLayer_ + layer, waferU, waferV, false); + int indx = HGCalWaferIndex::waferIndex(firstLayer_ + layer, wU, wV, false); if (std::find(indices_.begin(), indices_.end(), indx) != indices_.end()) debug = true; } + if (!dumpDets_.empty()) { + if ((std::find(dumpDets_.begin(), dumpDets_.end(), det_) != dumpDets_.end()) && + (hgcons_.waferInfo(layer, wU, wV).part != HGCalTypes::WaferFull)) + debug = true; + } hgcons_.waferFromPosition(xx, pos.y(), layer, waferU, waferV, cellU, cellV, waferType, wt, false, debug); } if (waferType >= 0) { @@ -118,24 +132,27 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz } else if (hgcons_.tileTrapezoid()) { std::array id = hgcons_.assignCellTrap(pos.x(), pos.y(), pos.z(), layer, false); if (id[2] >= 0) { - std::pair typm = hgcons_.tileType(layer, id[0], 0); - HGCScintillatorDetId detId(id[2], layer, iz * id[0], id[1], false, 0); + int ring(id[0]); + if (!(hgcons_.tileExist(iz, layer, ring, id[1])) && ((ring + 1) <= (hgcons_.tileRings(layer)).second)) + ++ring; + std::pair typm = hgcons_.tileType(layer, ring, 0); + HGCScintillatorDetId detId(id[2], layer, iz * ring, id[1], false, 0); if (typm.first >= 0) { detId.setType(typm.first); detId.setSiPM(typm.second); } index = detId.rawId(); - int lay = layer + hgcons_.getLayerOffset(); bool debug(false); if (!indices_.empty()) { - int indx = HGCalWaferIndex::waferIndex(lay, id[0], id[1], false); + int indx = HGCalTileIndex::tileIndex(layer, id[0], id[1]); if (std::find(indices_.begin(), indices_.end(), indx) != indices_.end()) debug = true; } if (debug) - edm::LogVerbatim("HGCSim") << "Radius/Phi " << id[0] << ":" << id[1] << " Type " << id[2] << ":" << typm.first - << " SiPM " << typm.second << ":" << hgcons_.tileSiPM(typm.second) << " Layer " - << layer << ":" << lay << " z " << iz << " " << detId << " wt " << wt; + edm::LogVerbatim("HGCSim") << "Radius/Phi " << ring << "(" << id[0] << "):" << id[1] << " Type " << id[2] << ":" + << typm.first << " SiPM " << typm.second << ":" << hgcons_.tileSiPM(typm.second) + << " Layer " << layer << " z " << iz << " " << detId << " wt " << wt << " position " + << pos << " R " << pos.perp(); #ifdef EDM_ML_DEBUG } else { edm::LogVerbatim("HGCSim") << "Radius/Phi " << id[0] << ":" << id[1] << " Type " << id[2] << " Layer|iz " << layer @@ -144,8 +161,8 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz } } #ifdef EDM_ML_DEBUG - bool matchOnly = (mode_ == HGCalGeometryMode::Hexagon8Module); - bool debug = (mode_ == HGCalGeometryMode::Hexagon8Module); + bool matchOnly = ((mode_ == HGCalGeometryMode::Hexagon8Module) || (mode_ == HGCalGeometryMode::Hexagon8Cassette)); + bool debug = hgcons_.waferHexagon8File(); if (debug) edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme::i/p " << det_ << ":" << layer << ":" << module << ":" << cell << ":" << iz << ":" << pos.x() << ":" << pos.y() << ":" << pos.z() << " ID " << std::hex diff --git a/SimG4CMS/Calo/test/python/runHGC7_cfg.py b/SimG4CMS/Calo/test/python/runHGC7_cfg.py index 0a5219929ea38..f723bebeeb038 100644 --- a/SimG4CMS/Calo/test/python/runHGC7_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC7_cfg.py @@ -18,7 +18,7 @@ if hasattr(process,'MessageLogger'): process.MessageLogger.HGCalGeom=dict() process.MessageLogger.HGCalSim=dict() - process.MessageLogger.CaloSim=dict() + process.MessageLogger.HGCSim=dict() process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runHGC8_cfg.py b/SimG4CMS/Calo/test/python/runHGC8_cfg.py index ed214a8027870..b15f28ab904dc 100644 --- a/SimG4CMS/Calo/test/python/runHGC8_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC8_cfg.py @@ -28,7 +28,7 @@ process.Timing = cms.Service("Timing") process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(10) + input = cms.untracked.int32(50) ) process.source = cms.Source("EmptySource", @@ -55,8 +55,8 @@ fileName = cms.untracked.string('hgcV16.root') ) -#process.hgcalHitScintillator.tileFileName = "scintillatorTiles.txt" -#process.g4SimHits.HGCScintSD.TileFileName = "scintillatorTiles.txt" +process.hgcalHitScintillator.tileFileName = "extraTiles.txt" +process.g4SimHits.HGCScintSD.TileFileName = "extraTiles.txt" process.generation_step = cms.Path(process.pgen) process.simulation_step = cms.Path(process.psim)