Merge branch 'master' into dd4hep-ecal-preshower-algo-v1

DQM/CSCMonitorModule/plugins/CSCDQM_Lock.h

@@ -45,7 +45,7 @@ namespace cscdqm {
 #ifdef DQMMT
     boost::recursive_mutex mutex;
 #else
-    bool mutex;
+    bool mutex = false;
 #endif
 
     /**

Fireworks/Core/src/FWItemValueGetter.cc

@@ -73,7 +73,11 @@ FWItemValueGetter::FWItemValueGetter(const edm::TypeWithDict& iType, const std::
   } else if (iPurpose == "HGCal Trigger Cell" || iPurpose == "HGCal Trigger Cluster") {
     addEntry("detId", 0);
   } else if (iPurpose == "CaloParticle") {
-    addEntry("energy", 1);
+    addEntry("energy", 3);
+    addEntry("pdgId()", 3, "pdgId");
+    addEntry("simClusters().size()", 3, "SimClSize");
+  } else if (iPurpose == "HGCal MultiCluster") {
+    addEntry("energy", 3);
   } else {
     // by the default  add pt, et, or energy
     bool x = addEntry("pt", 1);

Geometry/HGCalCommonData/data/TB181/Oct183/hgcal.xml

@@ -249,5 +249,11 @@
     <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
     <rRotation name="rotations:R090"/>
   </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
 </PosPartSection>
 </DDDefinition>

RecoLocalCalo/Configuration/python/RecoLocalCalo_Commissioning_cff.py

@@ -26,11 +26,12 @@
 #
 # sequence CaloLocalReco and CaloGlobalReco
 #
-calolocalreco = cms.Sequence(ecalLocalRecoSequence+hcalLocalRecoSequence)
-caloglobalreco = cms.Sequence(hcalGlobalRecoSequence)
+calolocalrecoTask = cms.Task(ecalLocalRecoTask,hcalLocalRecoTask)
+calolocalreco = cms.Sequence(calolocalrecoTask)
 
 #
 # R.Ofierzynski (29.Oct.2009): add NZS sequence
 #
 from RecoLocalCalo.Configuration.hcalLocalRecoNZS_cff import *
-calolocalrecoNZS = cms.Sequence(ecalLocalRecoSequence+hcalLocalRecoSequence+hcalLocalRecoSequenceNZS) 
+calolocalrecoTaskNZS = cms.Task(ecalLocalRecoTask,hcalLocalRecoTask,hcalLocalRecoTaskNZS) 
+calolocalrecoNZS = cms.Sequence(calolocalrecoTaskNZS) 

RecoLocalCalo/Configuration/python/RecoLocalCalo_Cosmics_cff.py

@@ -80,31 +80,32 @@ def hbheCosmic(module):
 from RecoLocalCalo.HcalRecProducers.hbheplan1_cfi import hbheplan1
 
 # redefine hcal sequence
-hcalLocalRecoSequence = cms.Sequence(hbhereco+hfreco+horeco+zdcreco)
+hcalLocalRecoTask = cms.Task(hbhereco,hfreco,horeco,zdcreco)
+hcalLocalRecoSequence = cms.Sequence(hcalLocalRecoTask)
 
-_phase1_hcalLocalRecoSequence = hcalLocalRecoSequence.copy()
-_phase1_hcalLocalRecoSequence.insert(0,hfprereco)
-run2_HF_2017.toReplaceWith(hcalLocalRecoSequence, _phase1_hcalLocalRecoSequence)
+_phase1_hcalLocalRecoTask = hcalLocalRecoTask.copy()
+_phase1_hcalLocalRecoTask.add(hfprereco)
+run2_HF_2017.toReplaceWith(hcalLocalRecoTask, _phase1_hcalLocalRecoTask)
 
 # shuffle modules so "hbheplan1" produces final collection of hits named "hbhereco"
-_plan1_hcalLocalRecoSequence = _phase1_hcalLocalRecoSequence.copy()
+_plan1_hcalLocalRecoTask = _phase1_hcalLocalRecoTask.copy()
 hbheprereco = hbhereco.clone()
-_plan1_hcalLocalRecoSequence.insert(0,hbheprereco)
+_plan1_hcalLocalRecoTask.add(hbheprereco)
 from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017
 run2_HEPlan1_2017.toReplaceWith(hbhereco, hbheplan1)
-run2_HEPlan1_2017.toReplaceWith(hcalLocalRecoSequence, _plan1_hcalLocalRecoSequence)
+run2_HEPlan1_2017.toReplaceWith(hcalLocalRecoTask, _plan1_hcalLocalRecoTask)
 
 hbhecollapse = hbheplan1.clone()
-_collapse_hcalLocalRecoSequence = _phase1_hcalLocalRecoSequence.copy()
-_collapse_hcalLocalRecoSequence.insert(0,hbheprereco)
+_collapse_hcalLocalRecoTask = _phase1_hcalLocalRecoTask.copy()
+_collapse_hcalLocalRecoTask.add(hbheprereco)
 from Configuration.ProcessModifiers.run2_HECollapse_2018_cff import run2_HECollapse_2018
 run2_HECollapse_2018.toReplaceWith(hbhereco, hbhecollapse)
-run2_HECollapse_2018.toReplaceWith(hcalLocalRecoSequence, _collapse_hcalLocalRecoSequence)
-
-calolocalrecoCosmics = cms.Sequence(ecalLocalRecoSequenceCosmics+hcalLocalRecoSequence)
-
+run2_HECollapse_2018.toReplaceWith(hcalLocalRecoTask, _collapse_hcalLocalRecoTask)
+calolocalrecoTaskCosmics = cms.Task(ecalLocalRecoTaskCosmics,hcalLocalRecoTask)
+calolocalrecoCosmics = cms.Sequence(calolocalrecoTaskCosmics)
 #
 # R.Ofierzynski (29.Oct.2009): add NZS sequence
 #
 from RecoLocalCalo.Configuration.hcalLocalRecoNZS_cff import *
-calolocalrecoCosmicsNZS = cms.Sequence(ecalLocalRecoSequenceCosmics+hcalLocalRecoSequence+hcalLocalRecoSequenceNZS) 
+calolocalrecoTaskCosmicsNZS = cms.Task(ecalLocalRecoTaskCosmics,hcalLocalRecoTask,hcalLocalRecoTaskNZS) 
+calolocalrecoCosmicsNZS = cms.Sequence(calolocalrecoTaskCosmicsNZS) 

RecoLocalCalo/Configuration/python/RecoLocalCalo_cff.py

@@ -20,8 +20,8 @@
 #
 # sequence CaloLocalReco and CaloGlobalReco
 #
-calolocalreco = cms.Sequence(ecalLocalRecoSequence+hcalLocalRecoSequence)
-caloglobalreco = cms.Sequence(hcalGlobalRecoSequence)
+calolocalrecoTask = cms.Task(ecalLocalRecoTask,hcalLocalRecoTask)
+calolocalreco = cms.Sequence(calolocalrecoTask)
 
 from RecoLocalCalo.HcalRecProducers.HcalHitSelection_cfi import *
 reducedHcalRecHitsSequence = cms.Sequence( reducedHcalRecHits )
@@ -30,11 +30,12 @@
 # R.Ofierzynski (29.Oct.2009): add NZS sequence
 #
 from RecoLocalCalo.Configuration.hcalLocalRecoNZS_cff import *
-calolocalrecoNZS = cms.Sequence(ecalLocalRecoSequence+hcalLocalRecoSequence+hcalLocalRecoSequenceNZS) 
+calolocalrecoTaskNZS = cms.Task(ecalLocalRecoTask,hcalLocalRecoTask,hcalLocalRecoTaskNZS)
+calolocalrecoNZS = cms.Sequence(calolocalrecoTaskNZS)
 
 from RecoLocalCalo.Configuration.hgcalLocalReco_cff import *
-_phase2_calolocalreco = calolocalreco.copy()
-_phase2_calolocalreco += hgcalLocalRecoSequence
+_phase2_calolocalrecoTask = calolocalrecoTask.copy()
+_phase2_calolocalrecoTask.add(hgcalLocalRecoTask)
 
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
-phase2_hgcal.toReplaceWith( calolocalreco , _phase2_calolocalreco )
+phase2_hgcal.toReplaceWith( calolocalrecoTask , _phase2_calolocalrecoTask )

RecoLocalCalo/Configuration/python/ecalLocalRecoSequenceCosmics_cff.py

@@ -15,7 +15,8 @@
 from RecoLocalCalo.EcalRecProducers.ecalRecHit_cfi import *
 from RecoLocalCalo.EcalRecProducers.ecalPreshowerRecHit_cfi import *
 from RecoLocalCalo.EcalRecProducers.ecalDetIdToBeRecovered_cfi import *
-ecalLocalRecoSequenceCosmics = cms.Sequence(ecalFixedAlphaBetaFitUncalibRecHit*ecalWeightUncalibRecHit*ecalDetIdToBeRecovered*ecalRecHit+ecalPreshowerRecHit)
+ecalLocalRecoTaskCosmics = cms.Task(ecalFixedAlphaBetaFitUncalibRecHit,ecalWeightUncalibRecHit,ecalDetIdToBeRecovered,ecalRecHit,ecalPreshowerRecHit)
+ecalLocalRecoSequenceCosmics = cms.Sequence(ecalLocalRecoTaskCosmics)
 ecalRecHit.EBuncalibRecHitCollection = 'ecalFixedAlphaBetaFitUncalibRecHit:EcalUncalibRecHitsEB'
 ecalRecHit.EEuncalibRecHitCollection = 'ecalFixedAlphaBetaFitUncalibRecHit:EcalUncalibRecHitsEE'
 ecalRecHit.ChannelStatusToBeExcluded = [

RecoLocalCalo/Configuration/python/ecalLocalRecoSequence_cff.py

@@ -23,24 +23,29 @@
 #ecalUncalibRecHitSequence = cms.Sequence(ecalGlobalUncalibRecHit*
 #                                         ecalDetIdToBeRecovered)
 
-ecalUncalibRecHitSequence = cms.Sequence(ecalMultiFitUncalibRecHit*
+ecalUncalibRecHitTask = cms.Task(ecalMultiFitUncalibRecHit,
                                         ecalDetIdToBeRecovered)
 
-ecalRecHitSequence        = cms.Sequence(ecalRecHit*
-                                         ecalCompactTrigPrim*
-                                         ecalTPSkim+
+ecalRecHitTask        = cms.Task(ecalRecHit,
+                                         ecalCompactTrigPrim,
+                                         ecalTPSkim,
                                          ecalPreshowerRecHit)
 
-ecalLocalRecoSequence     = cms.Sequence(ecalUncalibRecHitSequence*
-                                         ecalRecHitSequence)
+ecalLocalRecoTask     = cms.Task(ecalUncalibRecHitTask,
+                                         ecalRecHitTask)
+
+ecalUncalibRecHitSequence = cms.Sequence(ecalUncalibRecHitTask)
+ecalRecHitSequence = cms.Sequence(ecalRecHitTask)
+ecalLocalRecoSequence = cms.Sequence(ecalLocalRecoTask)
+
 
 from RecoLocalCalo.EcalRecProducers.ecalDetailedTimeRecHit_cfi import *
-_phase2_timing_ecalRecHitSequence = cms.Sequence( ecalRecHitSequence.copy() + ecalDetailedTimeRecHit )
+_phase2_timing_ecalRecHitTask = cms.Task( ecalRecHitTask.copy() , ecalDetailedTimeRecHit )
 from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
-phase2_timing.toReplaceWith( ecalRecHitSequence, _phase2_timing_ecalRecHitSequence )
+phase2_timing.toReplaceWith( ecalRecHitTask, _phase2_timing_ecalRecHitTask )
 
-_fastSim_ecalRecHitSequence = ecalRecHitSequence.copyAndExclude([ecalCompactTrigPrim,ecalTPSkim])
-_fastSim_ecalUncalibRecHitSequence = ecalUncalibRecHitSequence.copyAndExclude([ecalDetIdToBeRecovered])
+_fastSim_ecalRecHitTask = ecalRecHitTask.copyAndExclude([ecalCompactTrigPrim,ecalTPSkim])
+_fastSim_ecalUncalibRecHitTask = ecalUncalibRecHitTask.copyAndExclude([ecalDetIdToBeRecovered])
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
-fastSim.toReplaceWith(ecalRecHitSequence, _fastSim_ecalRecHitSequence)
-fastSim.toReplaceWith(ecalUncalibRecHitSequence, _fastSim_ecalUncalibRecHitSequence)
+fastSim.toReplaceWith(ecalRecHitTask, _fastSim_ecalRecHitTask)
+fastSim.toReplaceWith(ecalUncalibRecHitTask, _fastSim_ecalUncalibRecHitTask)

RecoLocalCalo/Configuration/python/hcalLocalRecoNZS_cff.py

@@ -29,7 +29,8 @@
 hfrecoMB.dropZSmarkedPassed = cms.bool(False)
 horecoMB.dropZSmarkedPassed = cms.bool(False)
 
-hcalLocalRecoSequenceNZS = cms.Sequence(hbherecoMB*hfrecoMB*horecoMB) 
+hcalLocalRecoTaskNZS = cms.Task(hbherecoMB,hfrecoMB,horecoMB) 
+hcalLocalRecoSequenceNZS = cms.Sequence(hcalLocalRecoTaskNZS) 
 
 import RecoLocalCalo.HcalRecProducers.hfprereco_cfi
 import RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi
@@ -50,29 +51,30 @@
     hbheInput = cms.InputTag("hbheprerecoMB")
 )
 
-_phase1_hcalLocalRecoSequenceNZS = hcalLocalRecoSequenceNZS.copy()
-_phase1_hcalLocalRecoSequenceNZS.insert(0,hfprerecoMB)
-
+_phase1_hcalLocalRecoTaskNZS = hcalLocalRecoTaskNZS.copy()
+_phase1_hcalLocalRecoTaskNZS.add(hfprerecoMB)
+ 
 from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017
-run2_HF_2017.toReplaceWith( hcalLocalRecoSequenceNZS, _phase1_hcalLocalRecoSequenceNZS )
+run2_HF_2017.toReplaceWith( hcalLocalRecoTaskNZS, _phase1_hcalLocalRecoTaskNZS )
 run2_HF_2017.toReplaceWith( hfrecoMB, _phase1_hfrecoMB )
+
 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
 run2_HCAL_2017.toModify( hbherecoMB,
     processQIE11 = cms.bool(True),
 # temporarily disabled until RecoLocalCalo/HcalRecProducers/python/HBHEPhase1Reconstructor_cfi.py:flagParametersQIE11 is filled
 #    setNoiseFlagsQIE11 = cms.bool(True),
 )
 
-_plan1_hcalLocalRecoSequenceNZS = _phase1_hcalLocalRecoSequenceNZS.copy()
+_plan1_hcalLocalRecoTaskNZS = _phase1_hcalLocalRecoTaskNZS.copy()
 hbheprerecoMB = hbherecoMB.clone()
-_plan1_hcalLocalRecoSequenceNZS.insert(0,hbheprerecoMB)
+_plan1_hcalLocalRecoTaskNZS.add(hbheprerecoMB)
 from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017
 run2_HEPlan1_2017.toReplaceWith(hbherecoMB, hbheplan1MB)
-run2_HEPlan1_2017.toReplaceWith(hcalLocalRecoSequenceNZS, _plan1_hcalLocalRecoSequenceNZS)
+run2_HEPlan1_2017.toReplaceWith(hcalLocalRecoTaskNZS, _plan1_hcalLocalRecoTaskNZS)
 
 hbhecollapseMB = hbheplan1MB.clone()
-_collapse_hcalLocalRecoSequenceNZS = _phase1_hcalLocalRecoSequenceNZS.copy()
-_collapse_hcalLocalRecoSequenceNZS.insert(0,hbheprerecoMB)
+_collapse_hcalLocalRecoTaskNZS = _phase1_hcalLocalRecoTaskNZS.copy()
+_collapse_hcalLocalRecoTaskNZS.add(hbheprerecoMB)
 from Configuration.ProcessModifiers.run2_HECollapse_2018_cff import run2_HECollapse_2018
 run2_HECollapse_2018.toReplaceWith(hbherecoMB, hbhecollapseMB)
-run2_HECollapse_2018.toReplaceWith(hcalLocalRecoSequenceNZS, _collapse_hcalLocalRecoSequenceNZS)
+run2_HECollapse_2018.toReplaceWith(hcalLocalRecoTaskNZS, _collapse_hcalLocalRecoTaskNZS)

RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py

@@ -15,7 +15,8 @@
 from RecoLocalCalo.HcalRecProducers.HcalHitReconstructor_ho_cfi import *
 from RecoLocalCalo.HcalRecProducers.HcalHitReconstructor_hf_cfi import *
 from RecoLocalCalo.HcalRecProducers.HcalHitReconstructor_zdc_cfi import *
-hcalLocalRecoSequence = cms.Sequence(hbheprereco+hfreco+horeco+zdcreco)
+hcalLocalRecoTask = cms.Task(hbheprereco,hfreco,horeco,zdcreco)
+hcalLocalRecoSequence = cms.Sequence(hcalLocalRecoTask)
 
 from RecoLocalCalo.HcalRecProducers.hfprereco_cfi import hfprereco
 from RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi import hfreco as _phase1_hfreco
@@ -24,33 +25,33 @@
 # copy for cosmics
 _default_hfreco = hfreco.clone()
 
-_phase1_hcalLocalRecoSequence = hcalLocalRecoSequence.copy()
-_phase1_hcalLocalRecoSequence.insert(0,hfprereco)
+_phase1_hcalLocalRecoTask = hcalLocalRecoTask.copy()
+_phase1_hcalLocalRecoTask.add(hfprereco)
 
 from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017
-run2_HF_2017.toReplaceWith( hcalLocalRecoSequence, _phase1_hcalLocalRecoSequence )
+run2_HF_2017.toReplaceWith( hcalLocalRecoTask, _phase1_hcalLocalRecoTask )
 run2_HF_2017.toReplaceWith( hfreco, _phase1_hfreco )
 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
 run2_HCAL_2017.toReplaceWith( hbheprereco, _phase1_hbheprereco )
 
-_plan1_hcalLocalRecoSequence = _phase1_hcalLocalRecoSequence.copy()
-_plan1_hcalLocalRecoSequence += hbheplan1
+_plan1_hcalLocalRecoTask = _phase1_hcalLocalRecoTask.copy()
+_plan1_hcalLocalRecoTask.add(hbheplan1)
 from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017
-run2_HEPlan1_2017.toReplaceWith(hcalLocalRecoSequence, _plan1_hcalLocalRecoSequence)
+run2_HEPlan1_2017.toReplaceWith(hcalLocalRecoTask, _plan1_hcalLocalRecoTask)
 
 hbhecollapse = hbheplan1.clone()
-_collapse_hcalLocalRecoSequence = _phase1_hcalLocalRecoSequence.copy()
-_collapse_hcalLocalRecoSequence += hbhecollapse
+_collapse_hcalLocalRecoTask = _phase1_hcalLocalRecoTask.copy()
+_collapse_hcalLocalRecoTask.add(hbhecollapse)
 from Configuration.ProcessModifiers.run2_HECollapse_2018_cff import run2_HECollapse_2018
-run2_HECollapse_2018.toReplaceWith(hcalLocalRecoSequence, _collapse_hcalLocalRecoSequence)
+run2_HECollapse_2018.toReplaceWith(hcalLocalRecoTask, _collapse_hcalLocalRecoTask)
 
-_phase2_hcalLocalRecoSequence = hcalLocalRecoSequence.copy()
-_phase2_hcalLocalRecoSequence.remove(hbheprereco)
+_phase2_hcalLocalRecoTask = hcalLocalRecoTask.copy()
+_phase2_hcalLocalRecoTask.remove(hbheprereco)
 
 from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal
-phase2_hcal.toReplaceWith( hcalLocalRecoSequence, _phase2_hcalLocalRecoSequence )
+phase2_hcal.toReplaceWith( hcalLocalRecoTask, _phase2_hcalLocalRecoTask )
 
 
-_fastSim_hcalLocalRecoSequence = hcalLocalRecoSequence.copyAndExclude([zdcreco])
+_fastSim_hcalLocalRecoTask = hcalLocalRecoTask.copyAndExclude([zdcreco])
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
-fastSim.toReplaceWith( hcalLocalRecoSequence, _fastSim_hcalLocalRecoSequence )
+fastSim.toReplaceWith( hcalLocalRecoTask, _fastSim_hcalLocalRecoTask )

RecoLocalCalo/Configuration/python/hgcalLocalReco_cff.py

@@ -5,15 +5,16 @@
 
 # patch particle flow clusters for HGC into local reco sequence
 # (for now until global reco is going with some sort of clustering)
-from RecoParticleFlow.PFClusterProducer.particleFlowRecHitHGC_cff import *
+from RecoParticleFlow.PFClusterProducer.particleFlowRecHitHGC_cfi import *
 from RecoParticleFlow.PFClusterProducer.particleFlowClusterHGC_cfi import *
 from RecoLocalCalo.HGCalRecProducers.hgcalMultiClusters_cfi import *
 from RecoLocalCalo.HGCalRecProducers.hgcalLayerClusters_cff import hgcalLayerClusters
 
-hgcalLocalRecoSequence = cms.Sequence( HGCalUncalibRecHit+
-                                       HGCalRecHit+
-                                       hgcalLayerClusters+
-                                       hgcalMultiClusters+
-                                       particleFlowRecHitHGCSeq+
-                                       particleFlowClusterHGCal+
+hgcalLocalRecoTask = cms.Task( HGCalUncalibRecHit,
+                                       HGCalRecHit,
+                                       hgcalLayerClusters,
+                                       hgcalMultiClusters,
+                                       particleFlowRecHitHGC,
+                                       particleFlowClusterHGCal,
                                        particleFlowClusterHGCalFromMultiCl )
+hgcalLocalRecoSequence = cms.Sequence(hgcalLocalRecoTask)

RecoLocalCalo/HGCalRecAlgos/src/RecHitTools.cc

@@ -138,7 +138,7 @@ GlobalPoint RecHitTools::getPosition(const DetId& id) const {
 }
 
 GlobalPoint RecHitTools::getPositionLayer(int layer, bool nose) const {
-  int lay = std::abs(layer);
+  unsigned int lay = std::abs(layer);
   double z(0);
   if (nose) {
     auto geomNose =
@@ -150,6 +150,10 @@ GlobalPoint RecHitTools::getPositionLayer(int layer, bool nose) const {
     }
   } else {
     const HGCalDDDConstants* ddd = get_ddd(geom_, geometryType_, fhOffset_, lay);
+    if (geometryType_ == 1) {
+      if (lay > fhOffset_)
+        lay -= fhOffset_;
+    }
     z = (layer > 0) ? ddd->waferZ(lay, true) : -ddd->waferZ(lay, true);
   }
   return GlobalPoint(0, 0, z);

RecoLocalCalo/HGCalRecProducers/python/HGCalLocalRecoTestBeamSequence_cff.py

@@ -6,4 +6,5 @@
 from RecoLocalCalo.HGCalRecProducers.hgcalLayerClusters_cff import hgcalLayerClusters
 from RecoLocalCalo.HGCalRecProducers.hgcalMultiClusters_cfi import *
 
-HGCalLocalRecoTestBeamSequence = cms.Sequence(HGCalUncalibRecHit*HGCalRecHit*hgcalLayerClusters*hgcalMultiClusters)
+HGCalLocalRecoTestBeamTask = cms.Task(HGCalUncalibRecHit,HGCalRecHit,hgcalLayerClusters,hgcalMultiClusters)
+HGCalLocalRecoTestBeamSequence = cms.Sequence(HGCalLocalRecoTestBeamTask)

SimG4CMS/Calo/data/APD1ProdCuts.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+ <SpecParSection label="regions.xml" eval="true">
+  <SpecPar name="ecal">
+   <PartSelector path="//ECAL"/>
+   <Parameter name="CMSCutsRegion" value="EcalRegion" eval="false"/>
+   <Parameter name="ProdCutsForElectrons" value="1*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="1*mm"/>
+   <Parameter name="ProdCutsForGamma" value="1*mm"/>
+  </SpecPar>
+  <SpecPar name="ebapd">
+   <PartSelector path="//EAPD.*"/>
+   <Parameter name="CMSCutsRegion" value="APDRegion" eval="false"/>
+   <Parameter name="ProdCutsForElectrons" value="0.005*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="0.005*mm"/>
+   <Parameter name="ProdCutsForGamma" value="0.005*mm"/>
+  </SpecPar>
+ </SpecParSection>
+</DDDefinition>

SimG4CMS/Calo/data/APD1sens.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+ <SpecParSection label="ecal" eval="true">
+  <SpecPar name="ecal_eb">
+   <PartSelector path="//EBRY.*"/>
+   <PartSelector path="//EAPD.*"/>
+   <Parameter name="SensitiveDetector" value="EcalSensitiveDetector" eval="false"/>
+   <Parameter name="ReadOutName" value="EcalHitsEB" eval="false"/>
+   <Parameter name="nxtalEta" value="85.0"/>
+   <Parameter name="PhiBaskets" value="18.0"/>
+   <Parameter name="nxtalPhi" value="360.0"/>
+   <Parameter name="EtaBaskets" value="25.0"/>
+   <Parameter name="EtaBaskets" value="45.0"/>
+   <Parameter name="EtaBaskets" value="65.0"/>
+   <Parameter name="EtaBaskets" value="85.0"/>
+   <Parameter name="EnergyWeight" value="1.0"/>
+   <Parameter name="Depth1Name" value="EAPD" eval="false"/>
+  </SpecPar>
+  <SpecPar name="ecal_ee">
+   <PartSelector path="//EFRY"/>
+   <Parameter name="SensitiveDetector" value="EcalSensitiveDetector" eval="false"/>
+   <Parameter name="ReadOutName" value="EcalHitsEE" eval="false"/>
+   <Parameter name="ncrys" value="25.0"/>
+   <Parameter name="nmods" value="316.0"/>
+   <Parameter name="EnergyWeight" value="1.0"/>
+  </SpecPar>
+  <SpecPar name="ecal_sf">
+   <PartSelector path="//SFSX"/>
+   <PartSelector path="//SFSY"/>
+   <Parameter name="SensitiveDetector" value="EcalSensitiveDetector" eval="false"/>
+   <Parameter name="ReadOutName" value="EcalHitsES" eval="false"/>
+   <Parameter name="EnergyWeight" value="0.0"/>
+  </SpecPar>
+ </SpecParSection>
+</DDDefinition>