Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 163726
b: "refs/heads/CMSSW_6_2_X_SLHC"
c: 8a422ff
h: "refs/heads/CMSSW_8_1_X"
  • Loading branch information
@cmsbuild
cmsbuild committed Jul 21, 2014
1 parent 6a80d3a commit 3170102
Show file tree
Hide file tree
Showing 30 changed files with 1,058 additions and 611 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
"refs/heads/CMSSW_8_1_X": a06485e080f53d91e8b47445ef79ab64e2f9756c
"refs/heads/CMSSW_6_2_X_SLHC": e000c74a58491f5cc922c3af4058261511681d91
"refs/heads/CMSSW_6_2_X_SLHC": 8a422ffd9f9a8a642cd682891572e81657d2aa21
4 changes: 4 additions & 0 deletions branches/CMSSW_6_2_X_SLHC/Configuration/StandardSequences/python/Services_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@
#an "intermediate layer" remains, just in case somebody is using it...
# from Configuration.StandardSequences.SimulationRandomNumberGeneratorSeeds_cff import *
from DQMServices.Core.DQMStore_cfg import *

# This needs to be taken out as soon as reading SLHC11 files is no longer required.
# Added 05/Jul/2014 by Mark Grimes as a horrible temporary hack.
from SimTracker.SiPixelDigitizer.RemapDetIdService_cfi import RemapDetIdService
252 changes: 126 additions & 126 deletions branches/CMSSW_6_2_X_SLHC/Geometry/HGCalCommonData/data/v5/hgcalCons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,96 +5,96 @@
<SpecPar name="HGCalEEReco">
<PartSelector path="//HGCalEESensitive.*"/>
<Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingZ" value="1"/>
<Parameter name="GroupingZ" value="1"/>
<Parameter name="GroupingZ" value="-1"/>
Expand Down Expand Up @@ -189,42 +189,42 @@
<SpecPar name="HGCalHESiliconReco">
<PartSelector path="//HGCalHESiliconSensitive.*"/>
<Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="1"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingXY" value="4"/>
<Parameter name="GroupingZ" value="1"/>
<Parameter name="GroupingZ" value="1"/>
<Parameter name="GroupingZ" value="1"/>
Expand Down
6 changes: 3 additions & 3 deletions branches/CMSSW_6_2_X_SLHC/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ void CaloTowersCreationAlgo::assignHit(const CaloRecHit * recHit) {
else passEmThreshold = (energy >= threshold);

}
else if (detId.subdetId() == EcalEndcap) {
else if (detId.subdetId() == EcalEndcap || detId.subdetId() == EcalShashlik) {
if (theUseEtEETresholdFlag) energy /= cosh( (theGeometry->getGeometry(detId)->getPosition()).eta() ) ;
if (theUseSymEETresholdFlag) passEmThreshold = (fabs(energy) >= threshold);
else passEmThreshold = (energy >= threshold);
Expand Down Expand Up @@ -974,7 +974,7 @@ void CaloTowersCreationAlgo::convert(const CaloTowerDetId& id, const MetaTower&
if (ac_it->subdetId() == EcalBarrel && theEbHandle.isValid()) {
thisEcalSevLvl = theEcalSevLvlAlgo->severityLevel( *ac_it, *theEbHandle);//, *theEcalChStatus);
}
else if (ac_it->subdetId() == EcalEndcap && theEeHandle.isValid()) {
else if ((ac_it->subdetId() == EcalEndcap || ac_it->subdetId() == EcalShashlik) && theEeHandle.isValid()) {
thisEcalSevLvl = theEcalSevLvlAlgo->severityLevel( *ac_it, *theEeHandle);//, *theEcalChStatus);
}

Expand Down Expand Up @@ -1046,7 +1046,7 @@ void CaloTowersCreationAlgo::getThresholdAndWeight(const DetId & detId, double &
weight = my.Eval(theEBEScale);
}
}
else if(subdet == EcalEndcap) {
else if(subdet == EcalEndcap || subdet == EcalShashlik) {
threshold = theEEthreshold;
weight = theEEweight;
if (weight <= 0.) {
Expand Down
2 changes: 1 addition & 1 deletion branches/CMSSW_6_2_X_SLHC/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ void CaloTowersCreator::produce(edm::Event& e, const edm::EventSetup& c) {
if ( (ec_tmp->begin()->detid()).subdetId() == EcalBarrel ) {
ebHandle = ec_tmp;
}
else if ((ec_tmp->begin()->detid()).subdetId() == EcalEndcap ) {
else if ((ec_tmp->begin()->detid()).subdetId() == EcalEndcap || (ec_tmp->begin()->detid()).subdetId() == EcalShashlik) {
eeHandle = ec_tmp;
}

Expand Down
27 changes: 26 additions & 1 deletion branches/CMSSW_6_2_X_SLHC/SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,16 @@ def cust_2023SHCal(process):
process.pfClusteringEK += process.particleFlowClusterECAL
process.particleFlowClusterECAL.inputECAL = cms.InputTag('particleFlowClusterEBEKMerger')
process.particleFlowCluster += process.pfClusteringEK

process.towerMaker.ecalInputs = cms.VInputTag(cms.InputTag("ecalRecHit","EcalRecHitsEB"), cms.InputTag("ecalRecHit","EcalRecHitsEK"))
process.towerMakerPF.ecalInputs = cms.VInputTag(cms.InputTag("ecalRecHit","EcalRecHitsEB"), cms.InputTag("ecalRecHit","EcalRecHitsEK"))
process.towerMakerWithHO.ecalInputs = cms.VInputTag(cms.InputTag("ecalRecHit","EcalRecHitsEB"), cms.InputTag("ecalRecHit","EcalRecHitsEK"))
process.towerMaker.EESumThreshold = cms.double(0.1)
process.towerMakerPF.EESumThreshold = cms.double(0.1)
process.towerMakerWithHO.EESumThreshold = cms.double(0.1)
process.towerMaker.EEThreshold = cms.double(0.035)
process.towerMakerPF.EEThreshold = cms.double(0.035)
process.towerMakerWithHO.EEThreshold = cms.double(0.035)

return process

def cust_2023HGCal(process):
Expand All @@ -177,6 +186,14 @@ def cust_2023HGCal(process):
process.mix.digitizers.hgceeDigitizer=process.hgceeDigitizer
process.mix.digitizers.hgchebackDigitizer=process.hgchebackDigitizer
process.mix.digitizers.hgchefrontDigitizer=process.hgchefrontDigitizer
# Also need to tell the MixingModule to make the correct collections available from
# the pileup, even if not creating CrossingFrames.
process.mix.mixObjects.mixCH.input.append( cms.InputTag("g4SimHits",process.hgceeDigitizer.hitCollection.value()) )
process.mix.mixObjects.mixCH.input.append( cms.InputTag("g4SimHits",process.hgchebackDigitizer.hitCollection.value()) )
process.mix.mixObjects.mixCH.input.append( cms.InputTag("g4SimHits",process.hgchefrontDigitizer.hitCollection.value()) )
process.mix.mixObjects.mixCH.subdets.append( process.hgceeDigitizer.hitCollection.value() )
process.mix.mixObjects.mixCH.subdets.append( process.hgchebackDigitizer.hitCollection.value() )
process.mix.mixObjects.mixCH.subdets.append( process.hgchefrontDigitizer.hitCollection.value() )
if hasattr(process,'reconstruction_step'):
process.particleFlowCluster += process.particleFlowRecHitHGC
process.particleFlowCluster += process.particleFlowClusterHGC
Expand Down Expand Up @@ -228,6 +245,14 @@ def cust_2023HGCalMuon(process):
process.mix.digitizers.hgceeDigitizer=process.hgceeDigitizer
process.mix.digitizers.hgchebackDigitizer=process.hgchebackDigitizer
process.mix.digitizers.hgchefrontDigitizer=process.hgchefrontDigitizer
# Also need to tell the MixingModule to make the correct collections available from
# the pileup, even if not creating CrossingFrames.
process.mix.mixObjects.mixCH.input.append( cms.InputTag("g4SimHits",process.hgceeDigitizer.hitCollection.value()) )
process.mix.mixObjects.mixCH.input.append( cms.InputTag("g4SimHits",process.hgchebackDigitizer.hitCollection.value()) )
process.mix.mixObjects.mixCH.input.append( cms.InputTag("g4SimHits",process.hgchefrontDigitizer.hitCollection.value()) )
process.mix.mixObjects.mixCH.subdets.append( process.hgceeDigitizer.hitCollection.value() )
process.mix.mixObjects.mixCH.subdets.append( process.hgchebackDigitizer.hitCollection.value() )
process.mix.mixObjects.mixCH.subdets.append( process.hgchefrontDigitizer.hitCollection.value() )
if hasattr(process,'reconstruction_step'):
process.particleFlowCluster += process.particleFlowRecHitHGC
process.particleFlowCluster += process.particleFlowClusterHGC
Expand Down
Loading

0 comments on commit 3170102

Please sign in to comment.