Merge pull request #24 from dildick/from-CMSSW_6_2_X_SLHC_2014-04-01-…

…1400 From cmssw 6 2 x slhc 2014 04 01 1400
cms-sw · Apr 2, 2014 · 891edd1 · 891edd1
2 parents 0c73f26 + 15836fc
commit 891edd1
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 23 deletions.
diff --git a/Configuration/Geometry/python/GeometryExtended2023Pixel_cff.py b/Configuration/Geometry/python/GeometryExtended2023Pixel_cff.py
@@ -3,6 +3,6 @@
 # Geometry master configuration
 #
 # Ideal geometry, needed for simulation
-from Geometry.CMSCommonData.cmsExtendedGeometry2023XML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2023PixelXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
 from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -1106,8 +1106,14 @@ def genvalid(fragment,d,suffix='all',fi=''):
              'Extended2023TTI',
              'Extended2023Muon',
              'Extended2023CFCal',
-             'Extended2023CFCal4Eta'
-             ]
+             'Extended2023CFCal4Eta',
+	     'Extended2023Pixel',            
+	     'Extended2023SHCalNoTaper',
+	     'Extended2023SHCalNoTaper4Eta',
+	     'Extended2023HGCal',
+	     'Extended2023HGCalMuon4Eta'
+
+	     ]
 upgradeGeoms={ '2017' : 'Extended2017',
                '2019' : 'Extended2019',
                '2019WithGEM' : 'Extended2019',
@@ -1125,7 +1131,12 @@ def genvalid(fragment,d,suffix='all',fi=''):
                'Extended2023TTI' : 'Extended2023TTI,Extended2023TTIReco',
                'Extended2023Muon' : 'Extended2023Muon,Extended2023MuonReco',
                'Extended2023CFCal' : 'Extended2023CFCal,Extended2023CFCalReco',
-               'Extended2023CFCal4Eta' : 'Extended2023CFCal4Eta,Extended2023CFCal4EtaReco'
+               'Extended2023CFCal4Eta' : 'Extended2023CFCal4Eta,Extended2023CFCal4EtaReco',
+               'Extended2023Pixel' : 'Extended2023Pixel,Extended2023PixelReco',
+               'Extended2023SHCalNoTaper' : 'Extended2023SHCalNoTaper,Extended2023SHCalNoTaperReco',
+               'Extended2023SHCalNoTaper4Eta' : 'Extended2023SHCalNoTaper4Eta,Extended2023SHCalNoTaper4EtaReco',
+               'Extended2023HGCal' : 'Extended2023HGCal,Extended2023HGCalReco',
+               'Extended2023HGCalMuon4Eta' : 'Extended2023HGCalMuon4Eta,Extended2023HGCalMuon4EtaReco'
                }
 upgradeGTs={ '2017' : 'auto:upgrade2017',
              '2019' : 'auto:upgrade2019',
@@ -1144,7 +1155,12 @@ def genvalid(fragment,d,suffix='all',fi=''):
              'Extended2023TTI' : 'auto:upgradePLS3',
              'Extended2023Muon' : 'auto:upgradePLS3',
              'Extended2023CFCal' : 'auto:upgradePLS3',
-             'Extended2023CFCal4Eta' : 'auto:upgradePLS3'
+             'Extended2023CFCal4Eta' : 'auto:upgradePLS3',
+             'Extended2023Pixel' : 'auto:upgradePLS3',
+             'Extended2023SHCalNoTaper' : 'auto:upgradePLS3',
+             'Extended2023SHCalNoTaper4Eta' : 'auto:upgradePLS3',
+             'Extended2023HGCal' : 'auto:upgradePLS3',
+             'Extended2023HGCalMuon4Eta' : 'auto:upgradePLS3'
              }
 upgradeCustoms={ '2017' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2017',
                  '2019' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2019',
@@ -1163,7 +1179,12 @@ def genvalid(fragment,d,suffix='all',fi=''):
                  'Extended2023TTI' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023TTI',
                  'Extended2023Muon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Muon',
                  'Extended2023CFCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
-                 'Extended2023CFCal4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023'
+                 'Extended2023CFCal4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
+                 'Extended2023Pixel' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Pixel',
+                 'Extended2023SHCalNoTaper' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
+                 'Extended2023SHCalNoTaper4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
+                 'Extended2023HGCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
+                 'Extended2023HGCalMuon4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023'
                  }
 ### remember that you need to add a new step for phase 2 to include the track trigger
 ### remember that you need to add fastsim
@@ -1195,7 +1216,12 @@ def genvalid(fragment,d,suffix='all',fi=''):
                    'Extended2023TTI':['GenSimHLBeamSpotFull','DigiTrkTrigFull'], ##no need to go beyond local reco
                    'Extended2023Muon':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
                    'Extended2023CFCal':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
-                   'Extended2023CFCal4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull']
+                   'Extended2023CFCal4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+	           'Extended2023Pixel':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],          
+	           'Extended2023SHCalNoTaper':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+	           'Extended2023SHCalNoTaper4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+	           'Extended2023HGCal':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+	           'Extended2023HGCalMuon4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull']
                    }
 
 upgradeStepDict={}

diff --git a/Geometry/GEMGeometry/test/GEMGeometryAnalyzer.cc b/Geometry/GEMGeometry/test/GEMGeometryAnalyzer.cc
@@ -163,9 +163,9 @@ GEMGeometryAnalyzer::analyze( const edm::Event& /*iEvent*/, const edm::EventSetu
 
 	      // base_bottom, base_top, height, strips, pads (all half length)
 	      auto& parameters(roll->specs()->parameters());
-	      float bottomEdge(parameters[0]);
-	      float topEdge(parameters[1]);
-	      float height(parameters[2]);
+	      float bottomEdge(parameters[0]*2);
+	      float topEdge(parameters[1]*2);
+	      float height(parameters[2]*2);
 	      float nStrips(parameters[3]);
 	      float nPads(parameters[4]);
 
@@ -222,9 +222,9 @@ GEMGeometryAnalyzer::analyze( const edm::Event& /*iEvent*/, const edm::EventSetu
 		ofos << "    \t\tType: " << type << endl
 		     << "    \t\tDimensions[cm]: b = " << bottomEdge << ", B = " << topEdge << ", h  = " << height << endl
 		     << "    \t\tnStrips = " << nStrips << ", nPads =  " << nPads << endl
-		     << "    \t\tcenter(x,y,z) = " << cx << " " << cy << " " << cz << ", center(eta,phi) = " << ceta << " " << cphi << endl
-		     << "    \t\ttop(x,y,z) = " << tx << " " << ty << " " << tz << ", top(eta,phi) = " << teta << " " << tphi << endl
-		     << "    \t\tbottom(x,y,z) = " << bx << " " << by << " " << bz << ", bottom(eta,phi) = " << beta << " " << bphi << endl
+		     << "    \t\tcenter(x,y,z)[cm] = " << cx << " " << cy << " " << cz << ", center(eta,phi) = " << ceta << " " << cphi << endl
+		     << "    \t\ttop(x,y,z)[cm] = " << tx << " " << ty << " " << tz << ", top(eta,phi) = " << teta << " " << tphi << endl
+		     << "    \t\tbottom(x,y,z)[cm] = " << bx << " " << by << " " << bz << ", bottom(eta,phi) = " << beta << " " << bphi << endl
 		     << "    \t\tpitch (top,center,bottom) = " << topPitch << " " << pitch << " " << bottomPitch << ", dEta = " << deta << ", dPhi = " << dphi << endl;
 
 	      ++k;

diff --git a/Geometry/GEMGeometry/test/testGEMGeometry_cfg.py b/Geometry/GEMGeometry/test/testGEMGeometry_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("Demo")
-process.load('Configuration.Geometry.GeometryExtended2023HGCalMuon_cff')
-process.load('Configuration.Geometry.GeometryExtended2023HGCalMuonReco_cff')
+process.load('Configuration.Geometry.GeometryExtended2023Muon_cff')
+process.load('Configuration.Geometry.GeometryExtended2023MuonReco_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 
 process.load('FWCore.MessageLogger.MessageLogger_cfi')

diff --git a/Geometry/GEMGeometryBuilder/data/GEMSpecs.xml b/Geometry/GEMGeometryBuilder/data/GEMSpecs.xml
@@ -1,13 +1,13 @@
 <?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="GEMSpecs.xml">
-    <SpecPar name="nStrips32" eval="true">
+    <SpecPar name="nStripsGE11" eval="true">
       <PartSelector path="//GHA1.."/>
       <Parameter name="nStrips" value="384"/>
     </SpecPar>
-    <SpecPar name="nPads32" eval="true">
+    <SpecPar name="nPadsGE11" eval="true">
       <PartSelector path="//GHA1.."/>
-      <Parameter name="nPads" value="96"/>
+      <Parameter name="nPads" value="192"/>
     </SpecPar>
   </SpecParSection>
 </DDDefinition>
diff --git a/Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml b/Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml
@@ -1,19 +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="GEMSpecs.xml">
-    <SpecPar name="nStrips384" eval="true">
+    <SpecPar name="nStripsGE11" eval="true">
       <PartSelector path="//GHA1.."/>
       <Parameter name="nStrips" value="384"/>
     </SpecPar>
-    <SpecPar name="nStrips768" eval="true">
+    <SpecPar name="nStripsGE21" eval="true">
       <PartSelector path="//GHA2.."/>
       <Parameter name="nStrips" value="768"/>
     </SpecPar>
-    <SpecPar name="nPads96" eval="true">
+    <SpecPar name="nPadsGE11" eval="true">
       <PartSelector path="//GHA1.."/>
-      <Parameter name="nPads" value="96"/>
+      <Parameter name="nPads" value="192"/>
     </SpecPar>
-    <SpecPar name="nPads192" eval="true">
+    <SpecPar name="nPadsGE21" eval="true">
       <PartSelector path="//GHA2.."/>
       <Parameter name="nPads" value="192"/>
     </SpecPar>

diff --git a/SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py b/SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py
@@ -101,6 +101,14 @@ def cust_2023(process):
     process=customise_rpc(process)
     return process
 
+def cust_2023Pixel(process):
+    process=customisePostLS1(process)
+    process=customiseBE5DPixel10D(process)
+    process=customise_HcalPhase2(process)
+    process=customise_ev_BE5DPixel10D(process)
+    process=customise_gem(process)
+    return process
+
 def cust_2023Muon(process):
     process=customisePostLS1(process)
     process=customiseBE5DPixel10D(process)