Skip to content

ZDC - Tuning of intercalibration workfow #11708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahor02 merged 3 commits into from
Aug 5, 2023
Merged

ZDC - Tuning of intercalibration workfow #11708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b04738c
Small update to intercalibration
cortesep Jul 26, 2023
20681bc
Small update to intercalibration
cortesep Jul 27, 2023
2c531a2
Please consider the following formatting changes (#81)
alibuild Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion Detectors/ZDC/calib/src/InterCalib.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,35 @@ int InterCalib::mini(int ih)
for (Int_t i = 0; i < NPAR; i++) {
mMn[ih]->GetParameter(i, mPar[ih][i], mErr[ih][i]);
}
// TODO: insert fallback in case fit fails
// Fallback in case fit fails on proton calorimeters
if (ih == 1 || ih == 3) {
for (int iretry = 0; iretry < 2; iretry++) {
bool retry = false;
const char* parn[5] = {"c0fix", "c1fix", "c2fix", "c3fix", "c4fix"};
l_bnd = mInterCalibConfig->l_bnd[ih];
u_bnd = mInterCalibConfig->u_bnd[ih];
for (int i = 1; i <= 4; i++) {
if (TMath::Abs(mPar[ih][i] - l_bnd) < 1e-3 || TMath::Abs(mPar[ih][i] - u_bnd) < 1e-3) {
retry = true;
LOG(warn) << "ih=" << ih << " par " << i << " too close to boundaries";
if (ih == 1) {
mMn[ih]->mnparm(i, parn[i], mTowerParam->tower_calib[IdZPAC + i], 0, l_bnd, u_bnd, ierflg);
} else if (ih == 3) {
mMn[ih]->mnparm(i, parn[i], mTowerParam->tower_calib[IdZPCC + i], 0, l_bnd, u_bnd, ierflg);
} else {
LOG(fatal) << "ERROR on InterCalib minimization ih=" << ih;
}
}
}
if (retry) {
LOG(warn) << "Retry minimization on ih=" << ih;
mMn[ih]->mnexcm("MIGRAD", arglist, 0, ierflg);
for (Int_t i = 0; i < NPAR; i++) {
mMn[ih]->GetParameter(i, mPar[ih][i], mErr[ih][i]);
}
}
}
}
mMtx.unlock();
return ierflg;
}
Expand Down
3 changes: 2 additions & 1 deletion Detectors/ZDC/macro/CreateTowerCalib.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "ZDCReconstruction/ZDCTowerParam.h"
#include <string>
#include <TFile.h>
#include <TString.h>
#include <map>

#endif
Expand Down Expand Up @@ -67,7 +68,7 @@ void CreateTowerCalib(long tmin = 0, long tmax = -1, std::string ccdbHost = "")
std::string ccdb_host = ccdbShortcuts(ccdbHost, conf.Class_Name(), CCDBPathTowerCalib);

if (endsWith(ccdb_host, ".root")) {
TFile f(ccdb_host.data(), "recreate");
TFile f(TString::Format(ccdb_host.data(), tmin, tmax), "recreate");
f.WriteObjectAny(&conf, conf.Class_Name(), "ccdb_object");
f.Close();
return;
Expand Down