Merge pull request #79 from cms-sw/CMSSW_6_2_X_SLHC

Cmssw 6 2 x slhc

Fireworks/Geometry/python/dumpFWRecoGeometry2019WithGem_cfg.py

@@ -0,0 +1,34 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("DUMP")
+process.load('Configuration.Geometry.GeometryExtended2019_cff')
+process.load('Configuration.Geometry.GeometryExtended2019Reco_cff')
+
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2019', '')
+
+process.add_(cms.ESProducer("FWRecoGeometryESProducer"))
+
+#Adding Timing service:
+process.Timing = cms.Service("Timing")
+process.options = cms.untracked.PSet(
+    wantSummary = cms.untracked.bool(True)
+    )
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+    )
+process.dump = cms.EDAnalyzer("DumpFWRecoGeometry",
+                              level = cms.untracked.int32(1)
+                              )
+
+process.p = cms.Path(process.dump)
+
+# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
+from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2019WithGem
+
+#call to customisation function cust_2019WithGem imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
+process = cust_2019WithGem(process)

Fireworks/Geometry/python/dumpFWRecoGeometry2023Muon_cfg.py

@@ -0,0 +1,35 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("DUMP")
+process.load('Configuration.Geometry.GeometryExtended2023MuonReco_cff')
+process.load('Configuration.Geometry.GeometryExtended2023Muon_cff')
+
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')
+
+process.add_(cms.ESProducer("FWRecoGeometryESProducer"))
+
+#Adding Timing service:
+process.Timing = cms.Service("Timing")
+process.options = cms.untracked.PSet(
+    wantSummary = cms.untracked.bool(True)
+    )
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+    )
+process.dump = cms.EDAnalyzer("DumpFWRecoGeometry",
+                              level = cms.untracked.int32(1)
+                              )
+
+process.p = cms.Path(process.dump)
+
+# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
+from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023Muon
+
+#call to customisation function cust_2023Muon imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
+process = cust_2023Muon(process)
+

Fireworks/Geometry/python/dumpSimGeometry2019WithGem_cfg.py

@@ -0,0 +1,20 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("DUMP")
+process.load('Configuration.Geometry.GeometryExtended2019Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2019_cff')
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+process.add_(cms.ESProducer("TGeoMgrFromDdd",
+        verbose = cms.untracked.bool(False),
+        level   = cms.untracked.int32(14)
+))
+
+process.dump = cms.EDAnalyzer("DumpSimGeometry")
+
+process.p = cms.Path(process.dump)

Fireworks/Geometry/python/dumpSimGeometry2023Muon_cfg.py

@@ -0,0 +1,20 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("DUMP")
+process.load('Configuration.Geometry.GeometryExtended2023MuonReco_cff')
+process.load('Configuration.Geometry.GeometryExtended2023Muon_cff')
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+process.add_(cms.ESProducer("TGeoMgrFromDdd",
+        verbose = cms.untracked.bool(False),
+        level   = cms.untracked.int32(14)
+))
+
+process.dump = cms.EDAnalyzer("DumpSimGeometry")
+
+process.p = cms.Path(process.dump)

Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc

@@ -93,21 +93,50 @@ void DDHGCalEEAlgo::constructLayers(DDLogicalPart module, DDCompactView& cpv) {
   DDRotation rot(DDName(DDSplit(rotstr).first, DDSplit(rotstr).second));
 
   double  zi(zMinBlock), zz(zMinBlock);
+  double layer0_thick(0);
+  if(idName == "HGCalEEM"){
+    for (unsigned int j=0; j<names.size()-1; j++) {
+      int jj = layerType[j];
+      layer0_thick += thick[jj];
+    }
+  }
+
   for (unsigned int i=0; i<layerType.size(); i++) {
     int     ii    = layerType[i];
     int     copy  = copyNumber[ii];
     ++copyNumber[ii];
+
+    double layer_thick(0);
+    if(idName == "HGCalEEM"){
+      if (i<names.size()-1) 
+	layer_thick = layer0_thick;
+      else if (i<11*names.size()-1) 
+	layer_thick = layer0_thick + thick[0];
+      else if (i<21*names.size()-1) 
+	layer_thick = layer0_thick + thick[1];
+      else 
+	layer_thick = layer0_thick + thick[2];
+    }
+    else {
+      if (i == 0) 
+	layer_thick = thick[ii];
+      else 
+	layer_thick = thick[0] + thick[1] + 3*thick[2] + thick[3] + thick[4];
+    }
+
+    if (heightType[i] == 0) zz = zi;
+    double  zlayer = zz + layer_thick;
     double  zo     = zi + thick[ii];
     double  rinF   = zi * slopeB;
-    double  rinB   = zo * slopeB;
+    double  rinB   = zlayer * slopeB;
     double  routF  = (heightType[i] == 0) ? rMax(zi) : rMax(zz);
     double  routB  = rMax(zo);
-    if (heightType[i] == 0) zz = zi;
+
     std::string name = "HGCal"+names[ii]+dbl_to_string(copy);
     edm::LogInfo("HGCalGeom") << "DDHGCalEEAlgo test: Layer " << i << ":" 
 			      << ii << " Front " << zi << ", " << rinF << ", " 
 			      << routF << " Back " << zo << ", " << rinB 
-			      << ", " << routB;
+			      << ", " << routB << " superlayer thickness " << layer_thick;
     DDHGCalEEAlgo::HGCalEEPar parm = parameterLayer(rinF, routF, rinB, 
 						    routB, zi, zo);
     DDSolid solid = DDSolidFactory::trap(DDName(name, idNameSpace), 

Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc

@@ -101,9 +101,10 @@ void DDHGCalHEAlgo::constructLayers(DDLogicalPart module, DDCompactView& cpv) {
     type[ii]       =-ityp;
     double zi      = zMinBlock[ii];
     zMinBlock[ii] += thickModule;
+    double zlayer = zz + thickModule;
     double zo      = zi + thick[ii];
     double rinF    = zi * slopeB;
-    double rinB    = zo * slopeB;
+    double rinB    = zlayer * slopeB;
     double routF   = (heightType[i] == 0) ? rMax(zi) : rMax(zz);
     double routB   = rMax(zo);
     if (heightType[i] == 0) zz = zi;

RecoTracker/IterativeTracking/python/Phase1PU140_InitialStep_cff.py

@@ -94,34 +94,34 @@
             minNumber3DLayers = 3,
             d0_par1 = ( 0.8, 4.0 ),
             dz_par1 = ( 0.9, 4.0 ),
-            d0_par2 = ( 0.5, 4.0 ),
-            dz_par2 = ( 0.7, 4.0 )
+            d0_par2 = ( 0.6, 4.0 ),
+            dz_par2 = ( 0.8, 4.0 )
             ), #end of pset
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
             name = 'initialStepTight',
             preFilterName = 'initialStepLoose',
-            chi2n_par = 1.2,
+            chi2n_par = 1.4,
             res_par = ( 0.003, 0.002 ),
             minNumberLayers = 3,
             maxNumberLostLayers = 2,
             minNumber3DLayers = 3,
             d0_par1 = ( 0.7, 4.0 ),
             dz_par1 = ( 0.8, 4.0 ),
-            d0_par2 = ( 0.4, 4.0 ),
-            dz_par2 = ( 0.6, 4.0 )
+            d0_par2 = ( 0.5, 4.0 ),
+            dz_par2 = ( 0.7, 4.0 )
             ),
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
             name = 'initialStep',
             preFilterName = 'initialStepTight',
-            chi2n_par = 0.9,
+            chi2n_par = 1.0,
             res_par = ( 0.003, 0.001 ),
             minNumberLayers = 3,
             maxNumberLostLayers = 2,
             minNumber3DLayers = 3,
             d0_par1 = ( 0.6, 4.0 ),
             dz_par1 = ( 0.7, 4.0 ),
-            d0_par2 = ( 0.35, 4.0 ),
-            dz_par2 = ( 0.45, 4.0 )
+            d0_par2 = ( 0.45, 4.0 ),
+            dz_par2 = ( 0.55, 4.0 )
             ),
         ) #end of vpset
     ) #end of clone

RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py

@@ -3,6 +3,7 @@
 # NEW CLUSTERS (remove previously used clusters)
 lowPtQuadStepClusters = cms.EDProducer("TrackClusterRemover",
     clusterLessSolution= cms.bool(True),
+    oldClusterRemovalInfo = cms.InputTag("highPtTripletStepClusters"),
     trajectories = cms.InputTag("highPtTripletStepTracks"),
     overrideTrkQuals = cms.InputTag('highPtTripletStepSelector','highPtTripletStep'),
     TrackQuality = cms.string('highPurity'),

RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py

@@ -3,6 +3,7 @@
 # NEW CLUSTERS (remove previously used clusters)
 lowPtTripletStepClusters = cms.EDProducer("TrackClusterRemover",
     clusterLessSolution= cms.bool(True),
+    oldClusterRemovalInfo = cms.InputTag("lowPtQuadStepClusters"),
     trajectories = cms.InputTag("lowPtQuadStepTracks"),
     overrideTrkQuals = cms.InputTag('lowPtQuadStepSelector','lowPtQuadStep'),
     TrackQuality = cms.string('highPurity'),

RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py

@@ -3,6 +3,7 @@
 # NEW CLUSTERS (remove previously used clusters)
 lowPtQuadStepClusters = cms.EDProducer("TrackClusterRemover",
     clusterLessSolution= cms.bool(True),
+    oldClusterRemovalInfo = cms.InputTag("highPtTripletStepClusters"),
     trajectories = cms.InputTag("highPtTripletStepTracks"),
     overrideTrkQuals = cms.InputTag('highPtTripletStepSelector','highPtTripletStep'),
     TrackQuality = cms.string('highPurity'),

RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py

@@ -3,6 +3,7 @@
 # NEW CLUSTERS (remove previously used clusters)
 lowPtTripletStepClusters = cms.EDProducer("TrackClusterRemover",
     clusterLessSolution= cms.bool(True),
+    oldClusterRemovalInfo = cms.InputTag("lowPtQuadStepClusters"),
     trajectories = cms.InputTag("lowPtQuadStepTracks"),
     overrideTrkQuals = cms.InputTag('lowPtQuadStepSelector','lowPtQuadStep'),
     TrackQuality = cms.string('highPurity'),

RecoTracker/IterativeTracking/python/Phase2PU140Pixel10D_DetachedQuadStep_cff.py

@@ -50,8 +50,8 @@
     RegionFactoryPSet = RegionPsetFomBeamSpotBlock.clone(
         ComponentName = cms.string('GlobalRegionProducerFromBeamSpot'),
         RegionPSet = RegionPsetFomBeamSpotBlock.RegionPSet.clone(
-            ptMin = 0.5,
-            originRadius = 0.5,
+            ptMin = 0.45,
+            originRadius = 0.7,
             nSigmaZ = 4.0
             )
     ),
@@ -154,7 +154,7 @@
     trackSelectors= cms.VPSet(
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
             name = 'detachedQuadStepVtxLoose',
-            chi2n_par = 0.9,
+            chi2n_par = 1.0,
             res_par = ( 0.003, 0.001 ),
             minNumberLayers = 3,
             d0_par1 = ( 0.9, 3.0 ),
@@ -164,7 +164,7 @@
             ),
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
             name = 'detachedQuadStepTrkLoose',
-            chi2n_par = 0.5,
+            chi2n_par = 0.6,
             res_par = ( 0.003, 0.001 ),
             minNumberLayers = 3,
             d0_par1 = ( 1.3, 4.0 ),
@@ -188,7 +188,7 @@
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
             name = 'detachedQuadStepTrkTight',
             preFilterName = 'detachedQuadStepTrkLoose',
-            chi2n_par = 0.35,
+            chi2n_par = 0.5,
             res_par = ( 0.003, 0.001 ),
             minNumberLayers = 4,
             maxNumberLostLayers = 1,
@@ -201,7 +201,7 @@
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
             name = 'detachedQuadStepVtx',
             preFilterName = 'detachedQuadStepVtxTight',
-            chi2n_par = 0.8,
+            chi2n_par = 0.9,
             res_par = ( 0.003, 0.001 ),
             minNumberLayers = 3,
             maxNumberLostLayers = 1,
@@ -214,7 +214,7 @@
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
             name = 'detachedQuadStepTrk',
             preFilterName = 'detachedQuadStepTrkTight',
-            chi2n_par = 0.35,
+            chi2n_par = 0.45,
             res_par = ( 0.003, 0.001 ),
             minNumberLayers = 4,
             maxNumberLostLayers = 0,

RecoTracker/IterativeTracking/python/Phase2PU140Pixel10D_HighPtTripletStep_cff.py

@@ -135,7 +135,7 @@
             minNumber3DLayers = 3,
             d0_par1 = ( 0.7, 4.0 ),
             dz_par1 = ( 0.8, 4.0 ),
-            d0_par2 = ( 0.4, 4.0 ),
+            d0_par2 = ( 0.6, 4.0 ),
             dz_par2 = ( 0.6, 4.0 )
             ), #end of pset
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
@@ -148,7 +148,7 @@
             minNumber3DLayers = 3,
             d0_par1 = ( 0.6, 4.0 ),
             dz_par1 = ( 0.7, 4.0 ),
-            d0_par2 = ( 0.35, 4.0 ),
+            d0_par2 = ( 0.5, 4.0 ),
             dz_par2 = ( 0.5, 4.0 )
             ),
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
@@ -159,9 +159,9 @@
             minNumberLayers = 3,
             maxNumberLostLayers = 2,
             minNumber3DLayers = 3,
-            d0_par1 = ( 0.4, 4.0 ),
+            d0_par1 = ( 0.5, 4.0 ),
             dz_par1 = ( 0.6, 4.0 ),
-            d0_par2 = ( 0.3, 4.0 ),
+            d0_par2 = ( 0.45, 4.0 ),
             dz_par2 = ( 0.45, 4.0 )
             ),
         ) #end of vpset

RecoTracker/IterativeTracking/python/Phase2PU140Pixel10D_LowPtQuadStep_cff.py

@@ -148,34 +148,34 @@
             minNumber3DLayers = 3,
             d0_par1 = ( 0.8, 4.0 ),
             dz_par1 = ( 0.7, 4.0 ),
-            d0_par2 = ( 0.5, 4.0 ),
-            dz_par2 = ( 0.5, 4.0 )
+            d0_par2 = ( 0.6, 4.0 ),
+            dz_par2 = ( 0.6, 4.0 )
             ), #end of pset
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone(
             name = 'lowPtQuadStepTight',
             preFilterName = 'lowPtQuadStepLoose',
-            chi2n_par = 1.3,
+            chi2n_par = 1.4,
             res_par = ( 0.003, 0.002 ),
             minNumberLayers = 3,
             maxNumberLostLayers = 2,
             minNumber3DLayers = 3,
             d0_par1 = ( 0.7, 4.0 ),
             dz_par1 = ( 0.6, 4.0 ),
-            d0_par2 = ( 0.4, 4.0 ),
-            dz_par2 = ( 0.4, 4.0 )
+            d0_par2 = ( 0.5, 4.0 ),
+            dz_par2 = ( 0.5, 4.0 )
             ),
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone(
             name = 'lowPtQuadStep',
             preFilterName = 'lowPtQuadStepTight',
-            chi2n_par = 0.9,
+            chi2n_par = 1.2,
             res_par = ( 0.003, 0.001 ),
             minNumberLayers = 3,
             maxNumberLostLayers = 2,
             minNumber3DLayers = 3,
             d0_par1 = ( 0.5, 4.0 ),
             dz_par1 = ( 0.5, 4.0 ),
-            d0_par2 = ( 0.3, 4.0 ),
-            dz_par2 = ( 0.4, 4.0 )
+            d0_par2 = ( 0.45, 4.0 ),
+            dz_par2 = ( 0.45, 4.0 )
             ),
         ) #end of vpset
     ) #end of clone