Skip to content

Please consider the following formatting changes to #14756 #1

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

Closed
alibuild wants to merge 1 commit into from
Closed

Please consider the following formatting changes to #14756 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Detectors/ITSMFT/ITS/workflow/include/ITSWorkflow/ThresholdCalibratorSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ class ITSThresholdCalibrator : public Task
short int mRunTypeRU[N_RU] = {0};
short int mRunTypeRUCopy[N_RU] = {0};
bool mFlagsRU[N_RU] = {0};
//short int mCdwCntRU[N_RU][N_ROW] = {{0}};
std::map<short int,std::map<short int, std::array<std::array<int, 500>, 500>>> mCdwCntRU; // RU --> row --> 2D hit map
// short int mCdwCntRU[N_RU][N_ROW] = {{0}};
std::map<short int, std::map<short int, std::array<std::array<int, 500>, 500>>> mCdwCntRU; // RU --> row --> 2D hit map
short int mLoopVal[N_RU][N_ROW] = {{0}};
bool mActiveLinks[N_RU][3] = {{false}};
std::set<short int> mRuSet;
Expand All @@ -243,7 +243,7 @@ class ITSThresholdCalibrator : public Task
short int mMin = -1, mMax = -1, mMin2 = 0, mMax2 = 0;
short int mStep = 1, mStep2 = 1;
short int mStrobeWindow = 5; // 5 means 5*25ns = 125 ns
short int mRowScan = 512; // number of scanned rows, used only to normalize % of success
short int mRowScan = 512; // number of scanned rows, used only to normalize % of success

// Get threshold method (fit == 1, derivative == 0, or hitcounting == 2)
char mFitType = -1;
Expand Down
101 changes: 50 additions & 51 deletions Detectors/ITSMFT/ITS/workflow/src/ThresholdCalibratorSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ void ITSThresholdCalibrator::init(InitContext& ic)
} catch (std::exception const& e) {
throw std::runtime_error("Number of scanned rows not found, mandatory in manual mode");
}

try {
manualMin = ic.options().get<short int>("manual-min");
} catch (std::exception const& e) {
Expand Down Expand Up @@ -757,31 +757,31 @@ void ITSThresholdCalibrator::extractThresholdRow(const short int& chipID, const
omp_set_num_threads(mNThreads);
#pragma omp parallel for schedule(dynamic)
#endif
// Loop over all columns (pixels) in the row
for (short int col_i = 0; col_i < this->N_COL; col_i++) {
// Do the threshold fit
float thresh = 0., noise = 0.;
bool success = false;
int spoints = 0;
// Loop over all columns (pixels) in the row
for (short int col_i = 0; col_i < this->N_COL; col_i++) {
// Do the threshold fit
float thresh = 0., noise = 0.;
bool success = false;
int spoints = 0;

if (isDumpS) { // already protected for multi-thread in the init
mFitHist->SetName(Form("scurve_chip%d_row%d_col%d_scani%d", chipID, row, col_i, scan_i));
}
if (isDumpS) { // already protected for multi-thread in the init
mFitHist->SetName(Form("scurve_chip%d_row%d_col%d_scani%d", chipID, row, col_i, scan_i));
}

success = this->findThreshold(chipID, mPixelHits[chipID][row][col_i],
this->mX, mScanType == 'r' ? N_RANGE2 : N_RANGE, thresh, noise, spoints, scan_i);
success = this->findThreshold(chipID, mPixelHits[chipID][row][col_i],
this->mX, mScanType == 'r' ? N_RANGE2 : N_RANGE, thresh, noise, spoints, scan_i);

vChipid[col_i] = chipID;
vRow[col_i] = row;
vThreshold[col_i] = (mScanType == 'T' || mScanType == 'r') ? (short int)(thresh * 10.) : (short int)(thresh);
vNoise[col_i] = (float)(noise * 10.); // always factor 10 also for ITHR/VCASN to not have all zeros
vSuccess[col_i] = success;
vPoints[col_i] = spoints > 0 ? (unsigned char)(spoints) : 0;
vChipid[col_i] = chipID;
vRow[col_i] = row;
vThreshold[col_i] = (mScanType == 'T' || mScanType == 'r') ? (short int)(thresh * 10.) : (short int)(thresh);
vNoise[col_i] = (float)(noise * 10.); // always factor 10 also for ITHR/VCASN to not have all zeros
vSuccess[col_i] = success;
vPoints[col_i] = spoints > 0 ? (unsigned char)(spoints) : 0;

if (mScanType == 'r') {
vMixData[col_i] = (scan_i * mStep) + mMin;
}
if (mScanType == 'r') {
vMixData[col_i] = (scan_i * mStep) + mMin;
}
}
if (mScanType == 'r') {
this->saveThreshold(); // save before moving to the next vresetd
}
Expand All @@ -801,8 +801,8 @@ void ITSThresholdCalibrator::extractThresholdRow(const short int& chipID, const

// Saves threshold information to internal memory
if (mScanType != 'P' && mScanType != 'p' && mScanType != 't' && mScanType != 'R' && mScanType != 'r') {
if(mVerboseOutput) {
LOG(info)<<"Saving data of ChipID: "<<chipID<<" Row: "<<row;
if (mVerboseOutput) {
LOG(info) << "Saving data of ChipID: " << chipID << " Row: " << row;
}
this->saveThreshold();
}
Expand Down Expand Up @@ -965,9 +965,9 @@ void ITSThresholdCalibrator::setRunType(const short int& runtype)
mRowScan = 11;
if (runtype == THR_SCAN_SHORT_33) {
mRowScan = 33;
} else if(runtype == THR_SCAN_SHORT_2_10HZ){
} else if (runtype == THR_SCAN_SHORT_2_10HZ) {
mRowScan = 2;
}
}
} else if (runtype == VCASN150 || runtype == VCASN100 || runtype == VCASN100_100HZ || runtype == VCASN130 || runtype == VCASNBB) {
// VCASN tuning for different target thresholds
// Store average VCASN for each chip into CCDB
Expand All @@ -979,7 +979,7 @@ void ITSThresholdCalibrator::setRunType(const short int& runtype)
this->mMax = inMaxVcasn; // 80 is the default
this->N_RANGE = mMax - mMin + 1;
this->mCheckExactRow = true;
mRowScan = 4;
mRowScan = 4;

} else if (runtype == ITHR150 || runtype == ITHR100 || runtype == ITHR100_100HZ || runtype == ITHR130) {
// ITHR tuning -- average ITHR per chip
Expand All @@ -991,7 +991,7 @@ void ITSThresholdCalibrator::setRunType(const short int& runtype)
this->mMax = inMaxIthr; // 100 is the default
this->N_RANGE = mMax - mMin + 1;
this->mCheckExactRow = true;
mRowScan = 4;
mRowScan = 4;

} else if (runtype == DIGITAL_SCAN || runtype == DIGITAL_SCAN_100HZ || runtype == DIGITAL_SCAN_NOMASK) {
// Digital scan -- only storing one value per chip, no fit needed
Expand Down Expand Up @@ -1389,11 +1389,10 @@ void ITSThresholdCalibrator::run(ProcessingContext& pc)
cwcnt = (short int)(calib.calibCounter);

// count injections
short int loopPoint = (loopval - this->mMin) / mStep;
short int chgPoint = (realcharge - this->mMin2) / mStep2;
auto &arr = mCdwCntRU[iRU][row];
arr[chgPoint][loopPoint]++;

short int loopPoint = (loopval - this->mMin) / mStep;
short int chgPoint = (realcharge - this->mMin2) / mStep2;
auto& arr = mCdwCntRU[iRU][row];
arr[chgPoint][loopPoint]++;

if (this->mVerboseOutput) {
LOG(info) << "RU: " << iRU << " CDWcounter: " << cwcnt << " row: " << row << " Loopval: " << loopval << " realcharge: " << realcharge << " confDBv: " << mCdwVersion;
Expand Down Expand Up @@ -1489,7 +1488,7 @@ void ITSThresholdCalibrator::run(ProcessingContext& pc)
if (ruIndex < 0) {
continue;
}
short int nL = ruIndex > 47 ? 2 : 3; // total number of links per RU
short int nL = ruIndex > 47 ? 2 : 3; // total number of links per RU
std::vector<short int> chipEnabled = getChipListFromRu(ruIndex, mActiveLinks[ruIndex]); // chip boundaries
// Fill the chipDone info string
if (mRunTypeRUCopy[ruIndex] == nInjScaled * nL) {
Expand All @@ -1502,27 +1501,27 @@ void ITSThresholdCalibrator::run(ProcessingContext& pc)
mRunTypeRUCopy[ruIndex] = 0; // reset here is safer (the other counter is reset in finalize)
}
// Check if scan of a row is finished: only for specific scans!
bool passCondition = true;
for(int j1=0; j1 < N_RANGE2; j1++) {
for(int j2=0; j2 < N_RANGE; j2++) {
if(mScanType == 't') { // ToT scan is done in specific ranges depending on charge (see ITSComm)
if ((j1 == 0 && j2<((600-mMin)/mStep)) || (j2>=((600-mMin)/mStep) && j2<=((800-mMin)/mStep)) || (j1==1 && j2>((800-mMin)/mStep))) {
if(mCdwCntRU[ruIndex][row][j1][j2] < nInjScaled * nL) {
passCondition = false;
break;
}
}
} else if(mCdwCntRU[ruIndex][row][j1][j2] < nInjScaled * nL) {
bool passCondition = true;
for (int j1 = 0; j1 < N_RANGE2; j1++) {
for (int j2 = 0; j2 < N_RANGE; j2++) {
if (mScanType == 't') { // ToT scan is done in specific ranges depending on charge (see ITSComm)
if ((j1 == 0 && j2 < ((600 - mMin) / mStep)) || (j2 >= ((600 - mMin) / mStep) && j2 <= ((800 - mMin) / mStep)) || (j1 == 1 && j2 > ((800 - mMin) / mStep))) {
if (mCdwCntRU[ruIndex][row][j1][j2] < nInjScaled * nL) {
passCondition = false;
break;
}
}
} else if (mCdwCntRU[ruIndex][row][j1][j2] < nInjScaled * nL) {
passCondition = false;
break;
}
break;
}
}
if(!passCondition){
if (!passCondition) {
break;
}
}
if (mVerboseOutput) {
LOG(info) << "PassCondition: " << passCondition << " - mCdwCntRU of RU" << ruIndex << " row " << row << " = " << mCdwCntRU[ruIndex][row][0][0] << "(Links: "<<mActiveLinks[ruIndex][0]<<", "<<mActiveLinks[ruIndex][1]<<","<<mActiveLinks[ruIndex][2]<<")";
LOG(info) << "PassCondition: " << passCondition << " - mCdwCntRU of RU" << ruIndex << " row " << row << " = " << mCdwCntRU[ruIndex][row][0][0] << "(Links: " << mActiveLinks[ruIndex][0] << ", " << mActiveLinks[ruIndex][1] << "," << mActiveLinks[ruIndex][2] << ")";
}

if (mScanType != 'D' && mScanType != 'A' && mScanType != 'P' && mScanType != 'R' && passCondition) {
Expand All @@ -1546,7 +1545,7 @@ void ITSThresholdCalibrator::run(ProcessingContext& pc)
mCdwCntRU[ruIndex].erase(row); // row is gone
}

if(mRunTypeRU[ruIndex] >= nInjScaled * nL && passCondition) {
if (mRunTypeRU[ruIndex] >= nInjScaled * nL && passCondition) {
mFlagsRU[ruIndex] = true;
finalize();
LOG(info) << "Shipping all outputs to aggregator (before endOfStream arrival!)";
Expand Down Expand Up @@ -1834,7 +1833,7 @@ void ITSThresholdCalibrator::finalize()
}
if (mVerboseOutput) {
LOG(info) << "Average or mpv " << name << " of chip " << it->first << " = " << outVal << " e-";
}
}
float status = ((float)it->second[4] / (float)(mRowScan * N_COL)) * 100.; // percentage of successful threshold extractions
if (status < mPercentageCut && (mScanType == 'I' || mScanType == 'V')) {
if (mScanType == 'I') { // default ITHR if percentage of success < mPercentageCut
Expand Down Expand Up @@ -2023,7 +2022,7 @@ DataProcessorSpec getITSThresholdCalibratorSpec(const ITSCalibInpConf& inpConf)
{"manual-step2", VariantType::Int, 1, {"Step2 value: defines the steps between manual-min2 and manual-max2. Default is 1. Use only in manual mode"}},
{"manual-scantype", VariantType::String, "T", {"scan type, can be D, T, I, V, P, p: use only in manual mode"}},
{"manual-strobewindow", VariantType::Int, 5, {"strobe duration in clock cycles, default is 5 = 125 ns: use only in manual mode"}},
{"manual-rowscan", VariantType::Int, 512, {"Number of ALPIDE rows scanned in the run: use only in manual mode"}},
{"manual-rowscan", VariantType::Int, 512, {"Number of ALPIDE rows scanned in the run: use only in manual mode"}},
{"save-tree", VariantType::Bool, false, {"Flag to save ROOT tree on disk: use only in manual mode"}},
{"scale-ninj", VariantType::Bool, false, {"Flag to activate the scale of the number of injects to be used to count hits from specific MEBs: use only in manual mode and in combination with --meb-select"}},
{"enable-mpv", VariantType::Bool, false, {"Flag to enable calculation of most-probable value in vcasn/ithr scans"}},
Expand Down