diff --git a/Validation/HGCalValidation/python/html.py b/Validation/HGCalValidation/python/html.py
index 2e41c5483d750..9e786845e31a0 100644
--- a/Validation/HGCalValidation/python/html.py
+++ b/Validation/HGCalValidation/python/html.py
@@ -97,8 +97,8 @@
"summary": "Summary",
"hitCalibration": "Reconstructed hits calibration",
"hitValidation" : "Simulated hits, digis, reconstructed hits validation" ,
- "hgcalLayerClusters": "Layer clusters",
- "allTiclMultiClusters":"TICL multiclusters",
+ "layerClusters": "Layer clusters",
+ "tracksters":"Tracksters",
"ticlMultiClustersFromTrackstersEM": "Electromagnetic multiclusters",
"ticlMultiClustersFromTrackstersHAD": "Hadronic multiclusters",
"hgcalMultiClusters" : "Old multiclusters",
@@ -108,13 +108,13 @@
_sectionNameMapOrder = collections.OrderedDict([
# These are for the summary page
# Will add later
- # hgcalLayerClusters
- ("hgcalLayerClusters", "Layer clusters"),
+ # layerClusters
+ ("layerClusters", "Layer clusters"),
# ticlMultiClustersFromTrackstersEM
("ticlMultiClustersFromTrackstersEM","Electromagnetic multiclusters"),
# ticlMultiClustersFromTrackstersHAD
("ticlMultiClustersFromTrackstersHAD","Hadronic multiclusters"),
- ("allTiclMultiClusters","TICL multiclusters"),
+ ("tracksters","Tracksters"),
# hgcalMultiClusters
("hgcalMultiClusters","Old multiclusters"),
])
@@ -124,8 +124,8 @@
#Objects to keep in summary
#_summobj = ['hitCalibration','hitValidation', 'hgcalLayerClusters','ticlMultiClustersFromTrackstersEM','ticlMultiClustersFromTrackstersHAD']
-_summobj = ['hitCalibration','hitValidation', 'hgcalLayerClusters','allTiclMultiClusters']
-#_summobj = ['hitCalibration','hitValidation', 'hgcalLayerClusters']
+_summobj = ['hitCalibration','hitValidation', 'layerClusters','tracksters']
+#_summobj = ['hitCalibration','hitValidation', 'layerClusters']
#Plots to keep in summary from hitCalibration
summhitcalib=[
@@ -144,36 +144,35 @@
#Plots to keep in summary from layer clusters
summlc = [
- 'hgcalLayerClusters_zminus/Efficiencies_vs_layer/globalEfficiencies.png' ,
- 'hgcalLayerClusters_zplus/Efficiencies_vs_layer/globalEfficiencies.png' ,
- 'hgcalLayerClusters_zminus/Duplicates_vs_layer/globalEfficiencies.png' ,
- 'hgcalLayerClusters_zplus/Duplicates_vs_layer/globalEfficiencies.png' ,
- 'hgcalLayerClusters_zminus/FakeRate_vs_layer/globalEfficiencies.png' ,
- 'hgcalLayerClusters_zplus/FakeRate_vs_layer/globalEfficiencies.png' ,
- 'hgcalLayerClusters_zminus/MergeRate_vs_layer/globalEfficiencies.png' ,
- 'hgcalLayerClusters_zplus/MergeRate_vs_layer/globalEfficiencies.png',
+ 'hgcalLayerClusters_Z-minus: LC_CP association/Efficiencies_vs_layer/globalEfficiencies.png' ,
+ 'hgcalLayerClusters_Z-plus: LC_CP association/Efficiencies_vs_layer/globalEfficiencies.png' ,
+ 'hgcalLayerClusters_Z-minus: LC_CP association/Duplicates_vs_layer/globalEfficiencies.png' ,
+ 'hgcalLayerClusters_Z-plus: LC_CP association/Duplicates_vs_layer/globalEfficiencies.png' ,
+ 'hgcalLayerClusters_Z-minus: LC_CP association/FakeRate_vs_layer/globalEfficiencies.png' ,
+ 'hgcalLayerClusters_Z-plus: LC_CP association/FakeRate_vs_layer/globalEfficiencies.png' ,
+ 'hgcalLayerClusters_Z-minus: LC_CP association/MergeRate_vs_layer/globalEfficiencies.png' ,
+ 'hgcalLayerClusters_Z-plus: LC_CP association/MergeRate_vs_layer/globalEfficiencies.png',
'SelectedCaloParticles_Photons/SelectedCaloParticles_num_caloparticle_eta.png',
'SelectedCaloParticles_Photons/SelectedCaloParticles_caloparticle_pt.png',
'SelectedCaloParticles_Photons/SelectedCaloParticles_caloparticle_phi.png',
'SelectedCaloParticles_Photons/SelectedCaloParticles_caloparticle_energy.png',
'SelectedCaloParticles_Photons/SelectedCaloParticles_Eta vs Zorigin.png'
]
-
#Plots to keep in summary from ticlMultiClustersFromTrackstersEM
summmcEM = [
- 'ticlMultiClustersFromTrackstersEM/Efficiencies/globalEfficiencies.png' ,
- 'ticlMultiClustersFromTrackstersEM/Duplicates/globalEfficiencies.png' ,
- 'ticlMultiClustersFromTrackstersEM/FakeRate/globalEfficiencies.png' ,
- 'ticlMultiClustersFromTrackstersEM/MergeRate/globalEfficiencies.png'
+ 'ticlTrackstersEM/Purities/globalEfficiencies.png' ,
+ 'ticlTrackstersEM/Duplicates/globalEfficiencies.png' ,
+ 'ticlTrackstersEM/FakeRate/globalEfficiencies.png' ,
+ 'ticlTrackstersEM/MergeRate/globalEfficiencies.png'
]
#Plots to keep in summary from ticlMultiClustersFromTrackstersHAD
summmcHAD = [
- 'ticlMultiClustersFromTrackstersHAD/Efficiencies/globalEfficiencies.png' ,
- 'ticlMultiClustersFromTrackstersHAD/Duplicates/globalEfficiencies.png' ,
- 'ticlMultiClustersFromTrackstersHAD/FakeRate/globalEfficiencies.png' ,
- 'ticlMultiClustersFromTrackstersHAD/MergeRate/globalEfficiencies.png'
+ 'ticlTrackstersHAD/Purities/globalEfficiencies.png' ,
+ 'ticlTrackstersHAD/Duplicates/globalEfficiencies.png' ,
+ 'ticlTrackstersHAD/FakeRate/globalEfficiencies.png' ,
+ 'ticlTrackstersHAD/MergeRate/globalEfficiencies.png'
]
summmcTICL = summmcEM + summmcHAD
@@ -188,8 +187,9 @@
_summary[obj] = {}
_summary['hitCalibration'] = summhitcalib
_summary['hitValidation'] = summhitvalid
-_summary['hgcalLayerClusters'] = summlc
-_summary['allTiclMultiClusters'] = summmcTICL
+_summary['layerClusters'] = summlc
+_summary['tracksters'] = summmcTICL
+#_summary['allTiclMultiClusters'] = summmcTICL
#_summary['ticlMultiClustersFromTrackstersEM'] = summmcEM
#_summary['ticlMultiClustersFromTrackstersHAD'] = summmcHAD
diff --git a/Validation/HGCalValidation/scripts/hgcalPerformanceValidation.py b/Validation/HGCalValidation/scripts/hgcalPerformanceValidation.py
index 8bd31f25ffc7a..2fd92688cd7f0 100755
--- a/Validation/HGCalValidation/scripts/hgcalPerformanceValidation.py
+++ b/Validation/HGCalValidation/scripts/hgcalPerformanceValidation.py
@@ -13,7 +13,7 @@
import sys
import os
-import commands
+import subprocess
import optparse
import pandas as pd
@@ -48,10 +48,10 @@ def parseOptions():
#------------------------------------------------------------------------------------------
#Some helpful functions
-#Processing the external os commands
+#Processing the external os subprocess
def processCmd(cmd, quite = 0):
print(cmd)
- status, output = commands.getstatusoutput(cmd)
+ status, output = subprocess.getstatusoutput(cmd)
if (status !=0 and not quite):
print('Error in processing command:\n ['+cmd+']')
print('Output:\n ['+output+'] \n')
@@ -83,7 +83,17 @@ def putype(t):
#------------------------------------------------------------------------------------------
#thereleases = { "CMSSW 11_1_X" : ["CMSSW_11_1_0_pre4_GEANT4","CMSSW_11_1_0_pre3","CMSSW_11_1_0_pre2"] }
thereleases = OrderedDict()
-thereleases = { "CMSSW 11_3_X" : [
+thereleases = { "CMSSW 12_0_X" : [
+ "CMSSW_12_0_0_pre4_vs_CMSSW_12_0_0_pre3",
+ "CMSSW_12_0_0_pre3_vs_CMSSW_12_0_0_pre2",
+ "CMSSW_12_0_0_pre2_vs_CMSSW_12_0_0_pre1",
+ "CMSSW_12_0_0_pre1_vs_CMSSW_11_3_0_pre6"
+ ],
+ "CMSSW 11_3_X" : [
+ "CMSSW_11_3_0_vs_CMSSW_11_3_0_pre6",
+ "CMSSW_11_3_0_pre6_vs_CMSSW_11_3_0_pre5",
+ "CMSSW_11_3_0_pre5_vs_CMSSW_11_3_0_pre4",
+ "CMSSW_11_3_0_pre4_vs_CMSSW_11_3_0_pre3",
"CMSSW_11_3_0_pre3_G4VECGEOM_vs_CMSSW_11_3_0_pre3",
"CMSSW_11_3_0_pre3_D76_vs_CMSSW_11_3_0_pre3",
"CMSSW_11_3_0_pre3_vs_CMSSW_11_3_0_pre2",
@@ -125,15 +135,16 @@ def putype(t):
geometryTests = OrderedDict()
geometryTests = { "Material budget" : [
#"Extended2026D49_vs_Extended2026D71",
- "Extended2026D49_vs_Extended2026D76"
+ "Extended2026D49_vs_Extended2026D76",
+ "Extended2026D76_vs_Extended2026D83"
]
}
-GeoScenario = "Extended2026D49_vs_Extended2026D76"
+GeoScenario = "Extended2026D76_vs_Extended2026D83"
-RefRelease='CMSSW_11_3_0_pre3'
+RefRelease='CMSSW_12_0_0_pre3'
-NewRelease='CMSSW_11_3_0_pre3_G4VECGEOM'
+NewRelease='CMSSW_12_0_0_pre4'
NotNormalRelease = "normal"
NotNormalRefRelease = "normal"
@@ -149,7 +160,8 @@ def putype(t):
# appendglobaltag = "_2026D49noPU_gcc900"
appendglobaltag = "_2026D76noPU"
else:
- appendglobaltag = "_2026D49noPU"
+ # appendglobaltag = "_2026D49noPU"
+ appendglobaltag = "_2026D76noPU"
#Until the final list of RelVals settles down the following sample list is under constant review
'''
@@ -202,17 +214,17 @@ def putype(t):
#------------------------------
#version v2 campaign
#Sample("RelValZpTT_1500", midfix="14", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- ##Sample("RelValZpTT_1500", midfix="14TeV", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValZpTT_1500", midfix="14TeV", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValZTT", midfix="14TeV", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValZMM", midfix="14", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValZEE", midfix="14", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- ##Sample("RelValTenTau_15_500_Eta3p1", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValTenTau_15_500_Eta3p1", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValTenTau_15_500", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValTTbar", midfix="14TeV", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValQCD_Pt15To7000_Flat", midfix="14", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- ##Sample("RelValQCD_Pt15To7000_Flat", midfix="14TeV", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValQCD_Pt15To7000_Flat", midfix="14TeV", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValNuGun", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- ##Sample("RelValMinBias", midfix="14", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValMinBias", midfix="14", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValMinBias", midfix="14TeV", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValH125GGgluonfusion", midfix="14", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" )
@@ -245,8 +257,6 @@ def putype(t):
#Sample("RelValSingleMuPt100", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
#Sample("RelValSingleMuPt1000", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" )
-
-
Sample("RelValSingleMuPt10", scenario="2026D49", appendGlobalTag=appendglobaltag ),
Sample("RelValSingleMuPt100", scenario="2026D49", appendGlobalTag=appendglobaltag ),
Sample("RelValSingleMuPt1000", scenario="2026D49", appendGlobalTag=appendglobaltag )
@@ -260,33 +270,33 @@ def putype(t):
#------------------------------
#version v2 campaign
- Sample("RelValCloseByPGun_CE_H_Fine_300um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValCloseByPGun_CE_H_Fine_200um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValCloseByPGun_CE_H_Fine_120um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValCloseByPGun_CE_H_Coarse_Scint", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValCloseByPGun_CE_H_Coarse_300um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValCloseByPGun_CE_E_Front_300um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValCloseByPGun_CE_E_Front_200um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValCloseByPGun_CE_E_Front_120um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValSingleGammaFlatPt8To150", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValSingleEFlatPt2To100", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
- Sample("RelValSinglePiFlatPt0p7To10", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" )
+ #Sample("RelValCloseByPGun_CE_H_Fine_300um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValCloseByPGun_CE_H_Fine_200um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValCloseByPGun_CE_H_Fine_120um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValCloseByPGun_CE_H_Coarse_Scint", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValCloseByPGun_CE_H_Coarse_300um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValCloseByPGun_CE_E_Front_300um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValCloseByPGun_CE_E_Front_200um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValCloseByPGun_CE_E_Front_120um", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValSingleGammaFlatPt8To150", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValSingleEFlatPt2To100", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" ),
+ #Sample("RelValSinglePiFlatPt0p7To10", scenario="2026D49", appendGlobalTag=appendglobaltag, version="v2" )
#------------------------------
#NORMAL version v1 campaign
- #Sample("RelValCloseByPGun_CE_H_Fine_300um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValCloseByPGun_CE_H_Fine_200um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValCloseByPGun_CE_H_Fine_120um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValCloseByPGun_CE_H_Coarse_Scint", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValCloseByPGun_CE_H_Coarse_300um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValCloseByPGun_CE_E_Front_300um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValCloseByPGun_CE_E_Front_200um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValCloseByPGun_CE_E_Front_120um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValSingleGammaFlatPt8To150", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValSingleEFlatPt2To100", scenario="2026D49", appendGlobalTag=appendglobaltag ),
- #Sample("RelValSinglePiFlatPt0p7To10", scenario="2026D49", appendGlobalTag=appendglobaltag )
+ Sample("RelValCloseByPGun_CE_H_Fine_300um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValCloseByPGun_CE_H_Fine_200um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValCloseByPGun_CE_H_Fine_120um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValCloseByPGun_CE_H_Coarse_Scint", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValCloseByPGun_CE_H_Coarse_300um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValCloseByPGun_CE_E_Front_300um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValCloseByPGun_CE_E_Front_200um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValCloseByPGun_CE_E_Front_120um", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValSingleGammaFlatPt8To150", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValSingleEFlatPt2To100", scenario="2026D49", appendGlobalTag=appendglobaltag ),
+ Sample("RelValSinglePiFlatPt0p7To10", scenario="2026D49", appendGlobalTag=appendglobaltag )
#------------------------------
#Sample("RelValCloseByPGun_CE_H_Fine_300um", scenario="2026D49", appendGlobalTag=appendglobaltag + "_HGCal" ),
@@ -370,9 +380,7 @@ def putype(t):
#------------------------------------------------------------------------------------------
#Objects processing section: The objects defined in --Obj are analyzed here.
#------------------------------------------------------------------------------------------
-
-#This is the hgcalLayerClusters, ticlMultiClustersFromTrackstersEM, ticlMultiClustersFromTrackstersHAD, and hitCalibration part
-if (opt.OBJ == 'hgcalLayerClusters' or opt.OBJ == 'hitCalibration' or opt.OBJ == 'ticlMultiClustersFromTrackstersEM' or opt.OBJ == 'ticlMultiClustersFromTrackstersHAD' or opt.OBJ == 'allTiclMultiClusters'):
+if (opt.OBJ == 'layerClusters' or opt.OBJ == 'hitCalibration' or opt.OBJ == 'hitValidation' or opt.OBJ == 'tracksters'):
fragments = []
#Now that we have them in eos lets produce plots
#Let's loop through RelVals
@@ -394,30 +402,30 @@ def putype(t):
inputpathNew = NewRepository +'/' + NewRelease+ '/'
if RefRelease == None:
- cmd = 'python Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename)+ ' --collection %s' %(opt.HTMLVALNAME)
+ cmd = 'python3 Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename)+ ' --collection %s' %(opt.HTMLVALNAME)
elif "raw" in NotNormalRelease and "normal" in NotNormalRefRelease:
- cmd = 'python Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("mcRun4_realistic_v3_2026D76noPU-v1","mcRun4_realistic_v3_2026D49noPU-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
- #cmd = 'python Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("mcRun4_realistic_v3_2026D49noPU_raw1100_rsb-v1","mcRun4_realistic_v3_2026D49noPU-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
+ cmd = 'python3 Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("mcRun4_realistic_v3_2026D76noPU-v1","mcRun4_realistic_v3_2026D49noPU-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
+ #cmd = 'python3 Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("mcRun4_realistic_v3_2026D49noPU_raw1100_rsb-v1","mcRun4_realistic_v3_2026D49noPU-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
elif "raw" in NotNormalRelease and "raw" in NotNormalRefRelease:
- #cmd = 'python Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease) + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
- cmd = 'python Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("_raw1100","_raw1100_rsb") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
+ #cmd = 'python3 Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease) + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
+ cmd = 'python3 Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("_raw1100","_raw1100_rsb") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
elif "normal" in NotNormalRelease and "normal" in NotNormalRefRelease:
- #cmd = 'python Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease) + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
- cmd = 'python Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("2026D49noPU-v2","2026D49noPU-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
+ cmd = 'python3 Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease) + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
+ #cmd = 'python3 Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("2026D49noPU-v2","2026D49noPU-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
else:
#print inputpathRef, infi.filename(RefRelease).replace("D49","D41")
#YOU SHOULD INSPECT EACH TIME THIS COMMAND AND THE REPLACE
- #cmd = 'python Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("D49","D41").replace("200-v2","200-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME) .replace("v2__", "v1__")
- cmd = 'python Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("mcRun4_realistic_v2-v1", "mcRun4_realistic_v2_2026D49noPU-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
+ #cmd = 'python3 Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("D49","D41").replace("200-v2","200-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME) .replace("v2__", "v1__")
+ cmd = 'python3 Validation/HGCalValidation/scripts/makeHGCalValidationPlots.py ' + inputpathRef + infi.filename(RefRelease).replace("mcRun4_realistic_v2-v1", "mcRun4_realistic_v2_2026D49noPU-v1") + ' ' + inputpathNew + infi.filename(NewRelease) + ' --outputDir HGCValid_%s_Plots --no-ratio --png --separate --html-sample "%s" ' %(opt.HTMLVALNAME, _sampleName[infi.name()] ) + ' --html-validation-name %s --subdirprefix ' %(opt.HTMLVALNAME) + ' plots_%s' % (samplename) + ' --collection %s' %(opt.HTMLVALNAME)
print(cmd)
if(opt.DRYRUN):
print('Dry-run: ['+cmd+']')
else:
output = processCmd(cmd)
- if opt.OBJ == 'hgcalLayerClusters':
+ if opt.OBJ == 'layerClusters':
processCmd('mv HGCValid_%s_Plots/plots_%s_Layer\ Clusters.html HGCValid_%s_Plots/index.html'%(opt.HTMLVALNAME,samplename,opt.HTMLVALNAME))
- processCmd('awk \'NR>=6&&NR<=589\' HGCValid_%s_Plots/index.html > HGCValid_%s_Plots/index_%s.html '% (opt.HTMLVALNAME,opt.HTMLVALNAME, samplename))
+ processCmd('awk \'NR>=6&&NR<=396\' HGCValid_%s_Plots/index.html > HGCValid_%s_Plots/index_%s.html '% (opt.HTMLVALNAME,opt.HTMLVALNAME, samplename))
processCmd('echo "
" >> HGCValid_%s_Plots/index_%s.html '%(opt.HTMLVALNAME, samplename) )
processCmd('echo "