Skip to content

Commit

Permalink
Merge branch 'master' into from-CMSSW_14_1_X_2024-05-22-2300_KBv1
Browse files Browse the repository at this point in the history
  • Loading branch information
@kbunkow
kbunkow authored May 28, 2024
2 parents 948fd54 + ab77a26 commit 83e721b
Show file tree
Hide file tree
Showing 53 changed files with 851 additions and 166 deletions.
1 change: 0 additions & 1 deletion .clang-tidy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Checks: -*,
,readability-uniqueptr-delete-release
WarningsAsErrors: ''
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
CheckOptions:
- key: google-readability-braces-around-statements.ShortStatementLines
value: '1'
Expand Down
11 changes: 11 additions & 0 deletions Alignment/OfflineValidation/bin/Zmumumerge.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,18 @@ int Zmumumerge(int argc, char* argv[]) {
pt::ptree alignments = main_tree.get_child("alignments");
pt::ptree validation = main_tree.get_child("validation");

//Load defined order
std::vector<std::pair<std::string, pt::ptree>> alignmentsOrdered;
for (const auto& childTree : alignments) {
alignmentsOrdered.push_back(childTree);
}
std::sort(alignmentsOrdered.begin(),
alignmentsOrdered.end(),
[](const std::pair<std::string, pt::ptree>& left, const std::pair<std::string, pt::ptree>& right) {
return left.second.get<int>("index") < right.second.get<int>("index");
});

for (const auto& childTree : alignmentsOrdered) {
// do not consider the nodes with a "file" to merge
if (childTree.second.find("file") == childTree.second.not_found()) {
std::cerr << "Ignoring alignment: " << childTree.second.get<std::string>("title") << ".\nNo file to merged found!"
Expand Down
20 changes: 15 additions & 5 deletions Alignment/OfflineValidation/python/TkAlAllInOneTool/DMRplotter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,17 @@ def __log__(self,log_type="",text=""):
else:
print(text)

def _middleString(self, fullString):
##############################################################
#Auxiliary function to retrieve object name from full string
##############################################################

middleString = "_".join(fullString.split("_")[1:])
if middleString.endswith("_y"): middleString = "_".join(middleString.split("_")[:-1])
middleString = "_".join(middleString.split("_")[:-1])
return middleString


def _replaceMulti(self, mainString, toBeReplaced, newString):
#################################
#Auxiliary function to remove
Expand Down Expand Up @@ -339,7 +350,7 @@ def __defineObjects__(self):
if objName in objAreIgnored: continue
objDict[objName] = []
for obj in objList:
if objName in obj.GetName():
if objName == self._middleString(obj.GetName()):
segment = ""
var = ""
if obj.GetName()[-1] == "y":
Expand Down Expand Up @@ -834,7 +845,7 @@ def addMC(self,filename):

def plotSingle(self):
##############################################
#Auxiliary plotter for unweighted Data and MC
#Auxiliary plotter for unweighted Data and MC
##############################################

#check for input file and create output dir
Expand Down Expand Up @@ -993,7 +1004,7 @@ def plot(self):
#order plots & prepare y-axis scale factors
isEmpty = True
maxY = 0.0
objGroup = []
objGroup = []
for objName in self.objNameList: #follow plotting order
for obj in objects[objName]:
if obj['var'] == var and obj['segment'] == segment:
Expand All @@ -1010,14 +1021,13 @@ def plot(self):
legStyle = "l"
if obj['type'] == "DATA":
drawStyle += "P HIST SAME"
legStyle = "p"
legStyle = "p"
objGroup.append({'hist' : obj['hist'],
'label' : legendLabel,
'stat' : self.__getStat__(obj['hist'],var),
'drawStyle' : drawStyle,
'legStyle' : legStyle
})

#draw & save
if not isEmpty:
legMinY = (1./self.legendOffset)+(1.-1./self.legendOffset)*(self.maxEntriesPerColumn-len(objGroup))/(self.maxEntriesPerColumn*3)
Expand Down
150 changes: 105 additions & 45 deletions Alignment/OfflineValidation/python/TkAlAllInOneTool/Zmumu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,53 @@

def Zmumu(config, validationDir):
##List with all jobs
jobs = []
jobs, singleJobs = [], []
zmumuType = "single"

##List with all wished IOVs
IOVs = []
##Dictionary of lists of all IOVs (can be different per each single job)
IOVs = {}

##Auxilliary dictionary of isData flags per each merged job
isDataMerged = {}

##Start with single Zmumu jobs
if not zmumuType in config["validations"]["Zmumu"]:
raise Exception("No 'single' key word in config for Zmumu")

for datasetName in config["validations"]["Zmumu"][zmumuType]:
for IOV in config["validations"]["Zmumu"][zmumuType][datasetName]["IOV"]:
for singleName in config["validations"]["Zmumu"][zmumuType]:
aux_IOV = config["validations"]["Zmumu"][zmumuType][singleName]["IOV"]
if not isinstance(aux_IOV, list) and aux_IOV.endswith(".txt"):
config["validations"]["Zmumu"][zmumuType][singleName]["IOV"] = []
with open(aux_IOV, 'r') as IOVfile:
for line in IOVfile.readlines():
if len(line) != 0: config["validations"]["Zmumu"][zmumuType][singleName]["IOV"].append(int(line))
for IOV in config["validations"]["Zmumu"][zmumuType][singleName]["IOV"]:
##Save IOV to loop later for merge jobs
if not IOV in IOVs:
IOVs.append(IOV)
if singleName not in IOVs.keys():
IOVs[singleName] = []
if IOV not in IOVs[singleName]:
IOVs[singleName].append(IOV)

for alignment in config["validations"]["Zmumu"][zmumuType][datasetName]["alignments"]:
for alignment in config["validations"]["Zmumu"][zmumuType][singleName]["alignments"]:
##Work directory for each IOV
workDir = "{}/Zmumu/{}/{}/{}/{}".format(validationDir, zmumuType, datasetName, alignment, IOV)
workDir = "{}/Zmumu/{}/{}/{}/{}".format(validationDir, zmumuType, singleName, alignment, IOV)

##Write local config
local = {}
local["output"] = "{}/{}/{}/{}/{}/{}".format(config["LFS"], config["name"], zmumuType, alignment, datasetName, IOV)
local["output"] = "{}/{}/Zmumu/{}/{}/{}/{}".format(config["LFS"], config["name"], zmumuType, alignment, singleName, IOV)
local["alignment"] = copy.deepcopy(config["alignments"][alignment])
local["validation"] = copy.deepcopy(config["validations"]["Zmumu"][zmumuType][datasetName])
local["alignment"]["name"] = alignment
local["validation"] = copy.deepcopy(config["validations"]["Zmumu"][zmumuType][singleName])
local["validation"].pop("alignments")
local["validation"]["IOV"] = IOV
if "dataset" in local["validation"]:
local["validation"]["dataset"] = local["validation"]["dataset"].format(IOV)
if "goodlumi" in local["validation"]:
local["validation"]["goodlumi"] = local["validation"]["goodlumi"].format(IOV)

##Write job info
job = {
"name": "Zmumu_{}_{}_{}_{}".format(zmumuType, alignment, datasetName, IOV),
"name": "Zmumu_{}_{}_{}_{}".format(zmumuType, alignment, singleName, IOV),
"dir": workDir,
"exe": "cmsRun",
"cms-config": "{}/src/Alignment/OfflineValidation/python/TkAlAllInOneTool/Zmumu_cfg.py".format(os.environ["CMSSW_BASE"]),
Expand All @@ -44,7 +58,9 @@ def Zmumu(config, validationDir):
"config": local,
}

jobs.append(job)
singleJobs.append(job)

jobs.extend(singleJobs)

##Do merge Zmumu if wished
if "merge" in config["validations"]["Zmumu"]:
Expand All @@ -54,40 +70,84 @@ def Zmumu(config, validationDir):

##Loop over all merge jobs/IOVs which are wished
for mergeName in config["validations"]["Zmumu"][zmumuType]:
for IOV in IOVs:
##Work directory for each IOV
workDir = "{}/Zmumu/{}/{}/{}".format(validationDir, zmumuType, mergeName, IOV)

##Write job info
local = {}

job = {
"name": "Zmumu_{}_{}_{}".format(zmumuType, mergeName, IOV),
"dir": workDir,
"exe": "Zmumumerge",
"run-mode": "Condor",
"dependencies": [],
"config": local,
}

for alignment in config["alignments"]:
##Deep copy necessary things from global config
local.setdefault("alignments", {})
local["alignments"][alignment] = copy.deepcopy(config["alignments"][alignment])
##Search for MC single(s)
singlesMC = []
for singleName in config["validations"]["Zmumu"][zmumuType][mergeName]['singles']:
if len(IOVs[singleName]) == 1 and int(IOVs[singleName][0]) == 1: singlesMC.append(singleName)
isMConly = (len(singlesMC) == len(config["validations"]["Zmumu"][zmumuType][mergeName]['singles']))
if isMConly:
isDataMerged[mergeName] = 0
elif len(singlesMC) == 0:
isDataMerged[mergeName] = 1
else:
isDataMerged[mergeName] = -1

##Loop over singles
for iname,singleName in enumerate(config["validations"]["Zmumu"][zmumuType][mergeName]['singles']):
isMC = (singleName in singlesMC)
if isMConly and iname > 0: continue #special case for MC only comparison
elif isMConly: singlesMC.pop(singlesMC.index(singleName))

for IOV in IOVs[singleName]:
##Work directory for each IOV
workDir = "{}/Zmumu/{}/{}/{}".format(validationDir, zmumuType, mergeName, IOV)

##Write job info
local = {}

job = {
"name": "Zmumu_{}_{}_{}".format(zmumuType, mergeName, IOV),
"dir": workDir,
"exe": "Zmumumerge",
"run-mode": "Condor",
"dependencies": [],
"config": local,
}

##Deep copy necessary things from global config + assure plot order
for alignment in config["alignments"]:
idxIncrement = 0
local.setdefault("alignments", {})
if alignment in config["validations"]["Zmumu"]["single"][singleName]["alignments"]: #Cover all DATA validations
local["alignments"][alignment] = copy.deepcopy(config["alignments"][alignment])
local["alignments"][alignment]['index'] = config["validations"]["Zmumu"]["single"][singleName]["alignments"].index(alignment)
local["alignments"][alignment]['isMC'] = False
for singleMCname in singlesMC:
if alignment in config["validations"]["Zmumu"]["single"][singleMCname]["alignments"]: #Add MC objects
local["alignments"][alignment] = copy.deepcopy(config["alignments"][alignment])
local["alignments"][alignment]['index'] = len(config["validations"]["Zmumu"]["single"][singleName]["alignments"])
local["alignments"][alignment]['index'] += idxIncrement + config["validations"]["Zmumu"]["single"][singleMCname]["alignments"].index(alignment)
local["alignments"][alignment]['isMC'] = True
idxIncrement += len(config["validations"]["Zmumu"]["single"][singleMCname]["alignments"])
local["validation"] = copy.deepcopy(config["validations"]["Zmumu"][zmumuType][mergeName])
local["output"] = "{}/{}/{}/{}/{}".format(config["LFS"], config["name"], zmumuType, mergeName, IOV)

##Loop over all single jobs
for singleJob in jobs:
##Get single job info and append to merge job if requirements fullfilled
alignment, datasetName, singleIOV = singleJob["name"].split("_")[2:]

if int(singleIOV) == IOV and datasetName in config["validations"]["Zmumu"][zmumuType][mergeName]["singles"]:
local["alignments"][alignment]["file"] = singleJob["config"]["output"]
job["dependencies"].append(singleJob["name"])

mergeJobs.append(job)
local["validation"]["IOV"] = IOV
if "customrighttitle" in local["validation"].keys():
if "IOV" in local["validation"]["customrighttitle"]:
local["validation"]["customrighttitle"] = local["validation"]["customrighttitle"].replace("IOV",str(IOV))
local["output"] = "{}/{}/Zmumu/{}/{}/{}".format(config["LFS"], config["name"], zmumuType, mergeName, IOV)

##Add global plotting options
if "style" in config.keys():
if "Zmumu" in config['style'].keys():
if zmumuType in config['style']['Zmumu'].keys():
local["style"] = copy.deepcopy(config["style"]["Zmumu"][zmumuType])
if "Rlabel" in local["style"] and "customrighttitle" in local["validation"].keys():
print("WARNING: custom right label is overwritten by global settings")

##Loop over all single jobs
for singleJob in jobs:
##Get single job info and append to merge job if requirements fullfilled
_alignment, _singleName, _singleIOV = singleJob["name"].split("_")[2:]
if _singleName in config["validations"]["Zmumu"][zmumuType][mergeName]["singles"]:
if int(_singleIOV) == IOV or (int(_singleIOV) == 1 and _singleName in singlesMC): #matching DATA job or any MC single job
local["alignments"][_alignment]["file"] = singleJob["config"]["output"]
job["dependencies"].append(singleJob["name"])

mergeJobs.append(job)

jobs.extend(mergeJobs)

if "trends" in config["validations"]["Zmumu"]:
print("[WARNING] Zmumu trends are not implemented yet. Nothing to do here...")

return jobs
6 changes: 4 additions & 2 deletions Alignment/OfflineValidation/src/PreparePVTrends.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,10 +558,12 @@ void PreparePVTrends::outputGraphs(const pv::wrappedTrends &allInputs,
g_asym->SetTitle(label);

// scatter or RMS TH1
h_RMS[index] = new TH1F(Form("h_RMS_dz_eta_%s", label.Data()), label, ticks.size() - 1, &(ticks[0]));
std::vector<double> newTicks = ticks;
newTicks.insert(newTicks.end(), ticks.back() + 1.);
h_RMS[index] = new TH1F(Form("h_RMS_dz_eta_%s", label.Data()), label, newTicks.size() - 1, &(newTicks[0]));
h_RMS[index]->SetStats(kFALSE);

for (size_t bincounter = 1; bincounter < ticks.size(); bincounter++) {
for (size_t bincounter = 1; bincounter < ticks.size() + 1; bincounter++) {
h_RMS[index]->SetBinContent(
bincounter, std::abs(allInputs.getHigh()[label][bincounter - 1] - allInputs.getLow()[label][bincounter - 1]));
h_RMS[index]->SetBinError(bincounter, 0.01);
Expand Down
65 changes: 65 additions & 0 deletions Calibration/HcalCalibAlgos/macros/CalibCorr.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
// void CalibCorrScale(infile, oufile, scale)
// Scales all contents of correction factors by "scale" from "infile"
// to "outfile"
// void CalibCorrScale2(infile, oufile, scaleB, scaleT, scaleE)
// Scales all contents of correction factors in the barrel, transition and
// endcap regions by "scaleB", "scaleT", "scaleE" from "infile" and writes
// them to "outfile"
//////////////////////////////////////////////////////////////////////////////
#ifndef CalibrationHcalCalibAlgosCalibCorr_h
#define CalibrationHcalCalibAlgosCalibCorr_h
Expand Down Expand Up @@ -144,6 +148,13 @@ unsigned int truncateId(unsigned int detId, int truncateFlag, bool debug = false
//Ignore depth index for depth > 1 in HB and HE
if (depth > 1)
depth = 2;
} else if (truncate0 == 6) {
//Ignore depth index for depth > 2 in HB and HE and
// depthe 1, 2 are considered as depth 1
if (depth <= 2)
depth = 1;
else
depth = 2;
}
id = (subdet << 25) | (0x1000000) | ((depth & 0xF) << 20) | ((zside > 0) ? (0x80000 | (ieta << 10)) : (ieta << 10));
if (debug) {
Expand Down Expand Up @@ -1353,4 +1364,58 @@ void CalibCorrScale(const char* infile, const char* outfile, double scale) {
myfile.close();
}
}

void CalibCorrScale2(const char* infile, const char* outfile, double scaleB, double scaleT, double scaleE) {
int ietasL[3] = {0, 13, 17};
int ietasH[3] = {14, 18, 29};
double scale[3] = {scaleB, scaleT, scaleE};
std::ofstream myfile;
myfile.open(outfile);
if (!myfile.is_open()) {
std::cout << "** ERROR: Can't open '" << outfile << std::endl;
} else {
if (std::string(infile) != "") {
std::ifstream fInput(infile);
if (!fInput.good()) {
std::cout << "Cannot open file " << infile << std::endl;
} else {
char buffer[1024];
unsigned int all(0), good(0), comment(0);
while (fInput.getline(buffer, 1024)) {
++all;
if (buffer[0] == '#') {
myfile << buffer << std::endl;
++comment;
continue; //ignore comment
}
std::vector<std::string> items = splitString(std::string(buffer));
if (items.size() != 5) {
std::cout << "Ignore line: " << buffer << std::endl;
} else {
++good;
int ieta = std::atoi(items[1].c_str());
int depth = std::atoi(items[2].c_str());
int jp(-1);
for (int j = 0; j < 3; ++j) {
if (std::abs(ieta) > ietasL[j] && std::abs(ieta) <= ietasH[j]) {
if (jp < 0)
jp = j;
}
}
if (jp < 0)
jp = 2;
float corrf = scale[jp] * std::atof(items[3].c_str());
float dcorr = scale[jp] * std::atof(items[4].c_str());
myfile << std::setw(10) << items[0] << std::setw(10) << std::dec << ieta << std::setw(10) << depth
<< std::setw(10) << corrf << " " << std::setw(10) << dcorr << std::endl;
}
}
fInput.close();
std::cout << "Reads total of " << all << ", " << comment << " and " << good << " good records from " << infile
<< " and copied to " << outfile << std::endl;
}
}
myfile.close();
}
}
#endif
3 changes: 2 additions & 1 deletion Calibration/HcalCalibAlgos/macros/CalibMonitor.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
// depths in HE with values > 1 as depth 2; (4)
// all depths in HB with values > 1 as depth 2;
// (5) all depths in HB and HE with values > 1
// as depth 2.
// as depth 2; (6) for depth = 1 and 2, depth =
// 1, else depth = 2.
// The digit *d* is used if zside is to be
// ignored (1) or not (0)
// (Default 0)
Expand Down
Loading

0 comments on commit 83e721b

Please sign in to comment.