Correct beamline

cms-sw · Sep 7, 2016 · fafeda1 · fafeda1
1 parent 0d9cf4f
commit fafeda1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml b/Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml
@@ -392,18 +392,26 @@
 
 <SpecParSection label="hgcalBeam.xml" eval="true">
   <SpecPar name="hgcalbeam">
-    <PartSelector path="//HcalTestBeamLineS.*"/>
-    <PartSelector path="//HcalTestBeamLineHaloCounter"/>
-    <PartSelector path="//HcalTestBeamLineMuonCounter"/>
-    <PartSelector path="//HcalTestBeamLineCK3"/>
-    <PartSelector path="//HcalTestBeamLineWChambGas"/>
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
     <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
     <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
   </SpecPar>
   <SpecPar name="hgcalbeamWC">
-    <PartSelector path="//HcalTestBeamLineWChambGas"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
     <Parameter name="Volume" value="WireChamber" eval="false"/>
   </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
 </SpecParSection>
 
 </DDDefinition>
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8XML_cfi.py
@@ -10,7 +10,8 @@
         'Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml',
         'Geometry/HGCalCommonData/data/TB161/hgcalsense.xml',
         'Geometry/HGCalCommonData/data/TB161/hgcProdCuts.xml',
-        'Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml'),
+        'Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml'
+                               ),
     rootNodeName = cms.string('cms:OCMS')
 )
 

diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERN_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERN_cfg.py
@@ -111,7 +111,14 @@
 process.RAWSIMoutput_step = cms.EndPath(process.RAWSIMoutput)
 
 # Schedule definition
-process.schedule = cms.Schedule(process.generation_step,process.gunfilter_step,process.genfiltersummary_step,process.simulation_step,process.analysis_step,process.endjob_step,process.RAWSIMoutput_step)
+process.schedule = cms.Schedule(process.generation_step,
+				process.genfiltersummary_step,
+				process.simulation_step,
+				process.gunfilter_step,
+				process.analysis_step,
+				process.endjob_step,
+				process.RAWSIMoutput_step,
+				)
 # filter all path with the production filter sequence
 for path in process.paths:
 	getattr(process,path)._seq = process.generator * getattr(process,path)._seq