Skip to content

Commit e3567aa

Browse files
authored
ITS Threshold: new logic for row-by-row data extraction (#13337)
* LOG info to important to make some useful logs to appear in infologger at the end of the run * change logic to extract data row by row to save all possible s-curves
1 parent c2776a8 commit e3567aa

File tree

2 files changed

+103
-233
lines changed

2 files changed

+103
-233
lines changed

Detectors/ITSMFT/ITS/workflow/include/ITSWorkflow/ThresholdCalibratorSpec.h

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ class ITSThresholdCalibrator : public Task
197197
bool findThresholdFit(const short int&, std::vector<std::vector<unsigned short int>>, const float*, const short int&, float&, float&, int&, int);
198198
bool findThresholdDerivative(std::vector<std::vector<unsigned short int>>, const float*, const short int&, float&, float&, int&, int);
199199
bool findThresholdHitcounting(std::vector<std::vector<unsigned short int>>, const float*, const short int&, float&, int);
200-
bool isScanFinished(const short int&, const short int&, const short int&);
201200
void findAverage(const std::array<long int, 6>&, float&, float&, float&, float&);
202201
void saveThreshold();
203202

@@ -207,17 +206,16 @@ class ITSThresholdCalibrator : public Task
207206
// Utils
208207
std::vector<short int> getIntegerVect(std::string&);
209208
short int getRUID(short int chipID);
210-
std::vector<short int> getChipBoundariesFromRu(short int, bool*);
209+
std::vector<short int> getChipListFromRu(short int, bool*);
211210
short int getLinkID(short int, short int);
212-
short int getActiveLinks(bool*);
211+
short int getNumberOfActiveLinks(bool*);
213212

214213
std::string mSelfName;
215214
std::string mDictName;
216215
std::string mNoiseName;
217216

218217
int mTFCounter = 0;
219218
bool mVerboseOutput = false;
220-
bool isForceEor = false;
221219
std::string mMetaType;
222220
std::string mOutputDir;
223221
std::string mMetafileDir = "/dev/null";
@@ -233,12 +231,10 @@ class ITSThresholdCalibrator : public Task
233231
short int mRunType = -1;
234232
short int mRunTypeUp = -1;
235233
short int mRunTypeRU[N_RU] = {0};
236-
short int mRunTypeChip[24120] = {0};
237-
short int mChipLastRow[24120] = {0};
234+
short int mCdwCntRU[N_RU] = {0};
235+
short int mRowRU[N_RU] = {0};
238236
bool mActiveLinks[N_RU][3] = {{false}};
239237
std::set<short int> mRuSet;
240-
short int mRu = 0;
241-
bool mIsChipDone[24120] = {false};
242238
// Either "T" for threshold, "V" for VCASN, or "I" for ITHR
243239
char mScanType = '\0';
244240
short int mMin = -1, mMax = -1, mMin2 = 0, mMax2 = 0;
@@ -266,9 +262,6 @@ class ITSThresholdCalibrator : public Task
266262
// Flag to avoid that endOfStream and stop are both done
267263
bool isEnded = false;
268264

269-
// Flag to enable cw counter check
270-
bool mCheckCw = false;
271-
272265
// Flag to tag single noisy pix in digital scan
273266
bool mTagSinglePix = false;
274267

@@ -284,7 +277,7 @@ class ITSThresholdCalibrator : public Task
284277
// To set min and max ITHR and VCASN in the tuning scans
285278
short int inMinVcasn = 30;
286279
short int inMaxVcasn = 100;
287-
short int inMinIthr = 15;
280+
short int inMinIthr = 25;
288281
short int inMaxIthr = 100;
289282

290283
// Flag to enable most-probable value calculation

0 commit comments

Comments
 (0)