Skip to content

Commit 92b7920

Browse files
committed
ITS3: digitizer pre-set response names
Signed-off-by: Felix Schlepper <[email protected]>
1 parent 1bdcfa7 commit 92b7920

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

Detectors/Upgrades/ITS3/base/include/ITS3Base/ITS3Params.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ struct ITS3Params : public o2::conf::ConfigurableParamHelper<ITS3Params> {
2727
// Chip studies
2828
bool useDeadChannelMap{false}; // Query for a dead channel map to study disabling individual tiles
2929
std::string chipResponseFunction{"APTS"}; // Chip response function one of "Alpide", "APTS" or "Mosaix" (not yet available)
30-
std::string responseFunctionIB{"response0"}; // Chip response function name for IB
31-
std::string responseFunctionOB{"response1"}; // Chip response function name for 0B
3230

3331
O2ParamDef(ITS3Params, "ITS3Params");
3432
};

Detectors/Upgrades/ITS3/simulation/src/Digitizer.cxx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,33 +45,31 @@ void Digitizer::init()
4545
}
4646

4747
if (!mParams.hasResponseFunctions()) {
48-
auto loadSetResponseFunc = [&](const char* fileIB, const char* fileOB, const char* name) {
49-
const auto& nameIB = ITS3Params::Instance().responseFunctionIB;
50-
const auto& nameOB = ITS3Params::Instance().responseFunctionOB;
51-
LOGP(info, "Loading response function for {}: IB={}:{} / OB={}:{}", name, nameIB, fileIB, nameOB, fileOB);
52-
auto fIB = TFile::Open(fileIB);
48+
auto loadSetResponseFunc = [&](const char* name, const char* fileIB, const char* nameIB, const char* fileOB, const char* nameOB) {
49+
LOGP(info, "Loading response function for {}: IB={}:{} ; OB={}:{}", name, nameIB, fileIB, nameOB, fileOB);
50+
auto fIB = TFile::Open(fileIB, "READ");
5351
if (fIB->IsZombie() || !fIB->IsOpen()) {
5452
LOGP(fatal, "Cannot open file {}", fileIB);
5553
}
56-
auto fOB = TFile::Open(fileIB);
54+
auto fOB = TFile::Open(fileIB, "READ");
5755
if (fOB->IsZombie() || !fOB->IsOpen()) {
5856
LOGP(fatal, "Cannot open file {}", fileOB);
5957
}
60-
mParams.setIBSimResponse(mSimRespIB = fIB->Get<o2::itsmft::AlpideSimResponse>(nameIB.c_str()));
61-
mParams.setOBSimResponse(mSimRespOB = fOB->Get<o2::itsmft::AlpideSimResponse>(nameOB.c_str()));
58+
mParams.setIBSimResponse(mSimRespIB = fIB->Get<o2::itsmft::AlpideSimResponse>(nameIB));
59+
mParams.setOBSimResponse(mSimRespOB = fOB->Get<o2::itsmft::AlpideSimResponse>(nameOB));
6260
fIB->Close();
6361
fOB->Close();
6462
};
6563

6664
if (const auto& func = ITS3Params::Instance().chipResponseFunction; func == "Alpide") {
6765
constexpr const char* responseFile = "$(O2_ROOT)/share/Detectors/ITSMFT/data/AlpideResponseData/AlpideResponseData.root";
68-
loadSetResponseFunc(responseFile, responseFile, "Alpide");
66+
loadSetResponseFunc("Alpide", responseFile, "response0", responseFile, "response1");
6967
mSimRespIBShift = mSimRespIB->getDepthMax() - SegmentationMosaix::mSensorLayerThickness / 2.f;
7068
mSimRespOBShift = mSimRespOB->getDepthMax() - Segmentation::SensorLayerThickness / 2.f;
7169
} else if (func == "APTS") {
72-
constexpr const char* responseFileIB = "$(O2_ROOT)/share/Detectors/Upgrades/ITS3/data/ITS3ChipResponseData/";
70+
constexpr const char* responseFileIB = "$(O2_ROOT)/share/Detectors/Upgrades/ITS3/data/ITS3ChipResponseData/APTSResponseData.root";
7371
constexpr const char* responseFileOB = "$(O2_ROOT)/share/Detectors/ITSMFT/data/AlpideResponseData/AlpideResponseData.root";
74-
loadSetResponseFunc(responseFileIB, responseFileOB, "APTS");
72+
loadSetResponseFunc("APTS", responseFileIB, "response1", responseFileOB, "response1");
7573
mSimRespIBShift = mSimRespIB->getDepthMax() - 10.e-4f;
7674
mSimRespOBShift = mSimRespOB->getDepthMax() - Segmentation::SensorLayerThickness / 2.f;
7775
} else {

0 commit comments

Comments
 (0)