Phase2-hgx293X Extend the possibility of new cells needed for rotated full wafers

Configuration/PyReleaseValidation/python/relval_standard.py

@@ -437,7 +437,7 @@
 workflows[138.1] = ['',['RunCosmics2021','RECOCOSDPROMPTRUN3','ALCACOSDPROMPTRUN3','HARVESTDCPROMPTRUN3']]
 workflows[138.2] = ['',['RunCosmics2021','RECOCOSDEXPRUN3','ALCACOSDEXPRUN3','HARVESTDCEXPRUN3']]
 ### 2021 Splash events
-workflows[138.3] = ['',['RunMinimumBias2021Splash','RECODR3Splash','HARVESTDR3']]
+workflows[138.3] = ['',['RunMinimumBias2021Splash','COPYPASTER3', 'RECODR3Splash','HARVESTDR3']]
 
 #### Test of lumi section boundary crossing with run2 2018D ####
 workflows[136.8861] = ['',['RunEGamma2018Dml1','HLTDR2_2018ml','RECODR2_2018reHLT_skimEGamma_Prompt_L1TEgDQM','HARVEST2018_L1TEgDQM_Prompt']]

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -3125,6 +3125,7 @@ def gen2021HiMix(fragment,howMuch):
                     '--conditions':'auto:run1_mc',
                     '--output':'\'[{"t":"RAW","e":"ALL"}]\'',
                     '--customise_commands':'"process.ALLRAWoutput.fastCloning=cms.untracked.bool(False)"'}
+steps['COPYPASTER3'] = merge([{'--era' : 'Run3'}, steps['COPYPASTE']])
 
 #miniaod
 stepMiniAODDefaults = { '-s'              : 'PAT',

DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py

@@ -107,7 +107,7 @@
 #----------------------------
 if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1 or 
     process.runType.getRunType() == process.runType.cosmic_run or process.runType.getRunType() == process.runType.cosmic_run_stage1 or 
-    process.runType.getRunType() == process.runType.hpu_run):
+    process.runType.getRunType() == process.runType.hpu_run or process.runType.getRunType() == process.runType.commissioning_run ):
     print("[beampixel_dqm_sourceclient-live_cfg]::running pp")
 
 

DQMServices/Components/scripts/dqmiodumpmetadata.py

@@ -14,13 +14,13 @@
 
 f = uproot.open(args.filename)
 things = f.keys()
-if b'Indices;1' in things:
-  indices = f[b'Indices']
-  runs = indices.array(b"Run")
-  lumis = indices.array(b"Lumi")
-  firstindex = indices.array(b"FirstIndex")
-  lastindex = indices.array(b"LastIndex")
-  types = indices.array(b"Type")
+if 'Indices;1' in things:
+  indices = f['Indices']
+  runs = indices['Run'].array()
+  lumis = indices['Lumi'].array()
+  firstindex = indices['FirstIndex'].array()
+  lastindex = indices['LastIndex'].array()
+  types = indices['Type'].array()
 
   counts = defaultdict(lambda: 0)
   for run, lumi, first, last, type in zip(runs, lumis, firstindex, lastindex, types):
@@ -54,5 +54,3 @@ def showrow():
 
 else:
   print("This does not look like DQMIO data.")
-
-

DQMServices/Components/scripts/dqmiolistmes.py

@@ -19,13 +19,13 @@
 
 f = uproot.open(args.filename)
 things = f.keys()
-if b'Indices;1' in things:
-  indices = f[b'Indices']
-  runs = indices.array(b"Run")
-  lumis = indices.array(b"Lumi")
-  firstindex = indices.array(b"FirstIndex")
-  lastindex = indices.array(b"LastIndex")
-  types = indices.array(b"Type")
+if 'Indices;1' in things:
+  indices = f['Indices']
+  runs = indices['Run'].array()
+  lumis = indices['Lumi'].array()
+  firstindex = indices['FirstIndex'].array()
+  lastindex = indices['LastIndex'].array()
+  types = indices['Type'].array()
 
   # If run is not provided, print all available runs in a given file.
   if args.r == None or args.r < 0:
@@ -36,25 +36,24 @@
     exit()
 
   treenames = [ # order matters!
-    b"Ints",
-    b"Floats",
-    b"Strings",
-    b"TH1Fs",
-    b"TH1Ss",
-    b"TH1Ds",
-    b"TH2Fs",
-    b"TH2Ss",
-    b"TH2Ds",
-    b"TH3Fs",
-    b"TProfiles",
-    b"TProfile2Ds"
+    "Ints",
+    "Floats",
+    "Strings",
+    "TH1Fs",
+    "TH1Ss",
+    "TH1Ds",
+    "TH2Fs",
+    "TH2Ss",
+    "TH2Ds",
+    "TH3Fs",
+    "TProfiles",
+    "TProfile2Ds"
   ]
-  trees = [f[name][b"FullName"].array() for name in treenames]
+  trees = [f[name]["FullName"].array() for name in treenames]
 
   for run, lumi, first, last, type in zip(runs, lumis, firstindex, lastindex, types):
     if run == args.r and lumi == args.l:
       for i in range(first, int(last + 1)): # In DQMIO both ranges are inclusive
-        print(trees[type][i].decode())
+        print(trees[type][i])
 else:
   print("This does not look like DQMIO data.")
-

DQMServices/Demo/test/runtests.sh

@@ -72,7 +72,7 @@ dqmiodumpmetadata.py merged.root | grep -q '4 runs, 12 lumisections'
 rootlist ()
 {  python3 -c '
 import uproot
-for k in uproot.open("'"$1"'").allkeys(): print(k.decode())'
+for k in uproot.open("'"$1"'").keys(): print(k)'
 }
 
 # we need to exclude MEs filled on run and lumi boundaries, since the split job *does* see a different number of begin/end run/lumi transitions.

Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml

@@ -23,9 +23,9 @@
     <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/test/cms.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcal.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalpos.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcal.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalcell.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalpos.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/dd4hep/world.xml"/>
   </IncludeSection>
 

Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcal.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<ConstantsSection label="hgcal.xml" eval="true">
+  <Constant name="WaferSize"             value="166.4408*mm"/>
+  <Constant name="WaferThickness"        value="0.30*mm"/>
+  <Constant name="WaferThicknessFine"    value="0.30*mm"/>
+  <Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
+  <Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
+  <Constant name="CellThicknessFine"     value="0.12*mm"/>
+  <Constant name="CellThicknessCoarse1"  value="0.20*mm"/>
+  <Constant name="CellThicknessCoarse2"  value="0.30*mm"/>
+  <Constant name="NumberOfCellsFine"     value="12"/>
+  <Constant name="NumberOfCellsCoarse"   value="8"/>
+</ConstantsSection>
+
+</DDDefinition>
+
+

Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalcell.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<ConstantsSection label="hgcalcell.xml" eval="true">
+  <Constant name="WaferSize"             value="[hgcal:WaferSize]"/>
+  <Constant name="WaferThicknessFine"    value="[hgcal:WaferThicknessFine]"/>
+  <Constant name="WaferThicknessCoarse1" value="[hgcal:WaferThicknessCoarse1]"/>
+  <Constant name="WaferThicknessCoarse2" value="[hgcal:WaferThicknessCoarse2]"/>
+  <Constant name="CellThicknessFine"     value="[hgcal:CellThicknessFine]"/>
+  <Constant name="CellThicknessCoarse1"  value="[hgcal:CellThicknessCoarse1]"/>
+  <Constant name="CellThicknessCoarse2"  value="[hgcal:CellThicknessCoarse2]"/>
+  <Constant name="NumberOfCellsFine"     value="[hgcal:NumberOfCellsFine]"/>
+  <Constant name="NumberOfCellsCoarse"   value="[hgcal:NumberOfCellsCoarse]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalcell.xml" eval="true">
+  <Algorithm name="hgcal:DDHGCalCell">
+    <rParent name="hgcalwafer:HGCalCell"/>
+    <Numeric name="WaferSize"    value="[WaferSize]"/>
+    <Numeric name="WaferThick"   value="[WaferThicknessFine]"/>
+    <Numeric name="CellThick"    value="[CellThicknessFine]"/>
+    <Numeric name="NCells"       value="[NumberOfCellsFine]"/>
+    <Numeric name="PosSensitive" value="0"/>
+    <String name="Material"      value="materials:Silicon"/>
+    <String name="FullCell"      value="HGCalEECellFull0Fine"/>
+    <String name="FullSensitive" value="HGCalEESensitiveFull0Fine"/>
+    <Vector name="TruncatedCell" type="string" nEntries="6">
+       HGCalEECellTrunc01Fine, HGCalEECellTrunc02Fine,
+       HGCalEECellTrunc03Fine, HGCalEECellTrunc04Fine,
+       HGCalEECellTrunc05Fine, HGCalEECellTrunc06Fine</Vector>
+    <Vector name="TruncatedSensitive" type="string" nEntries="6">
+      HGCalEESensitiveTrunc01Fine, HGCalEESensitiveTrunc02Fine,
+      HGCalEESensitiveTrunc03Fine, HGCalEESensitiveTrunc04Fine,
+      HGCalEESensitiveTrunc05Fine, HGCalEESensitiveTrunc06Fine</Vector>
+    <Vector name="ExtendedCell" type="string" nEntries="6">
+       HGCalEECellExten01Fine, HGCalEECellExten02Fine,
+       HGCalEECellExten03Fine, HGCalEECellExten04Fine,
+       HGCalEECellExten05Fine, HGCalEECellExten06Fine</Vector>
+    <Vector name="ExtendedSensitive" type="string" nEntries="6">
+      HGCalEESensitiveExten01Fine, HGCalEESensitiveExten02Fine,
+      HGCalEESensitiveExten03Fine, HGCalEESensitiveExten04Fine,
+      HGCalEESensitiveExten05Fine, HGCalEESensitiveExten06Fine</Vector>
+    <Vector name="CornerCell" type="string" nEntries="12">
+       HGCalEECellCorner01Fine, HGCalEECellCorner02Fine,
+       HGCalEECellCorner03Fine, HGCalEECellCorner04Fine,
+       HGCalEECellCorner05Fine, HGCalEECellCorner06Fine,
+       HGCalEECellCorner07Fine, HGCalEECellCorner08Fine,
+       HGCalEECellCorner09Fine, HGCalEECellCorner10Fine,
+       HGCalEECellCorner11Fine, HGCalEECellCorner12Fine</Vector>
+    <Vector name="CornerSensitive" type="string" nEntries="12">
+      HGCalEESensitiveCorner01Fine, HGCalEESensitiveCorner02Fine,
+      HGCalEESensitiveCorner03Fine, HGCalEESensitiveCorner04Fine,
+      HGCalEESensitiveCorner05Fine, HGCalEESensitiveCorner06Fine,
+      HGCalEESensitiveCorner07Fine, HGCalEESensitiveCorner08Fine,
+      HGCalEESensitiveCorner09Fine, HGCalEESensitiveCorner10Fine,
+      HGCalEESensitiveCorner11Fine, HGCalEESensitiveCorner126Fine</Vector>
+  </Algorithm>
+</PosPartSection>
+
+</DDDefinition>

Geometry/HGCalCommonData/data/hgcalcell/vtest/hgcalpos.xml

@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<PosPartSection label="hgcalpos.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellFull0Fine"/>
+    <Translation x="0.0*cm" y="6.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc01Fine"/>
+    <Translation x="-7.5*cm" y="3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc02Fine"/>
+    <Translation x="-4.5*fm" y="3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc03Fine"/>
+    <Translation x="-1.5*cm" y="3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc04Fine"/>
+    <Translation x="1.5*cm" y="3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc05Fine"/>
+    <Translation x="4.5*cm" y="3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc06Fine"/>
+    <Translation x="7.5*cm" y="3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten01Fine"/>
+    <Translation x="-7.5*cm" y="0.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten02Fine"/>
+    <Translation x="-4.5*cm" y="0.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten03Fine"/>
+    <Translation x="-1.5*cm" y="0.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten04Fine"/>
+    <Translation x="1.5*cm" y="0.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten05Fine"/>
+    <Translation x="4.5*cm" y="0.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten06Fine"/>
+    <Translation x="7.5*cm" y="0.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner01Fine"/>
+    <Translation x="-7.5*cm" y="-3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner02Fine"/>
+    <Translation x="-4.5*cm" y="-3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner03Fine"/>
+    <Translation x="-1.5*cm" y="-3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner04Fine"/>
+    <Translation x="1.5*cm" y="-3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner05Fine"/>
+    <Translation x="4.5*cm" y="-3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner06Fine"/>
+    <Translation x="7.5*cm" y="-3.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner07Fine"/>
+    <Translation x="-7.5*cm" y="-6.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner08Fine"/>
+    <Translation x="-4.5*cm" y="-6.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner09Fine"/>
+    <Translation x="-1.5*cm" y="-6.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner10Fine"/>
+    <Translation x="1.5*cm" y="-6.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner11Fine"/>
+    <Translation x="4.5*cm" y="-6.0*cm" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner12Fine"/>
+    <Translation x="7.5*cm" y="-6.0*cm" z="0*fm"/>
+  </PosPart>
+</PosPartSection>
+
+</DDDefinition>

Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml

@@ -13,6 +13,7 @@
   <Constant name="CellThicknessCoarse2"  value="0.30*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
+  <Constant name="LayerRotation"         value="0*deg"/>
   <Constant name="radMixL0"              value="1537.05*mm"/>
   <Constant name="radMixL1"              value="1537.05*mm"/>
   <Constant name="radMixL2"              value="1537.05*mm"/>