Skip to content
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

Jump to bottom

MTD simulation: premixing tuning #29039

Merged
merged 2 commits into from Feb 27, 2020
Merged

MTD simulation: premixing tuning #29039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c97972
Tuning of the MTD premixing configuration
casarsa Feb 19, 2020
2358a53
Data field extended to 16 bits
casarsa Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 7 additions & 9 deletions DataFormats/FTLDigi/interface/PMTDSimAccumulator.h
View file
Open in desktop
Expand Up @@ -29,23 +29,21 @@ class PMTDSimAccumulator {
};
class Data {
public:
constexpr static unsigned energyOffset = 14;
constexpr static unsigned energyOffset = 4;
constexpr static unsigned energyMask = 0x3;
constexpr static unsigned sampleOffset = 10;
constexpr static unsigned sampleMask = 0xf;
constexpr static unsigned dataOffset = 0;
constexpr static unsigned dataMask = 0x3ff;
constexpr static unsigned dataMask = 0xffff;

Data() : data_(0) {}
Data(unsigned short ei, unsigned short si, unsigned short d)
: data_((ei << energyOffset) | (si << sampleOffset) | d) {}
Data() : data_(0), indices_(0) {}
Data(unsigned short ei, unsigned short si, unsigned short d) : data_(d), indices_((ei << energyOffset) | si) {}

unsigned int energyIndex() const { return data_ >> energyOffset; }
unsigned int sampleIndex() const { return (data_ >> sampleOffset) & sampleMask; }
unsigned int energyIndex() const { return indices_ >> energyOffset; }
unsigned int sampleIndex() const { return indices_ & sampleMask; }
unsigned int data() const { return data_ & dataMask; }

private:
unsigned short data_;
unsigned char indices_;
};

PMTDSimAccumulator() = default;
Expand Down
6 changes: 3 additions & 3 deletions SimFastTiming/FastTimingCommon/interface/MTDDigitizer.h
View file
Open in desktop
Expand Up @@ -66,7 +66,7 @@ namespace mtd_digitizer {

const float minPackChargeLog = minCharge > 0.f ? std::log(minCharge) : -2;
const float maxPackChargeLog = std::log(maxCharge);
constexpr uint16_t base = 1 << PMTDSimAccumulator::Data::sampleOffset;
constexpr uint16_t base = PMTDSimAccumulator::Data::dataMask;

simResult.reserve(simData.size());
// mimicking the digitization
Expand Down Expand Up @@ -96,7 +96,7 @@ namespace mtd_digitizer {
const float maxCharge) {
const float minPackChargeLog = minCharge > 0.f ? std::log(minCharge) : -2;
const float maxPackChargeLog = std::log(maxCharge);
constexpr uint16_t base = 1 << PMTDSimAccumulator::Data::sampleOffset;
constexpr uint16_t base = PMTDSimAccumulator::Data::dataMask;

for (const auto& detIdIndexHitInfo : simAccumulator) {
auto foo = simData.emplace(
Expand All @@ -120,7 +120,7 @@ namespace mtd_digitizer {

if (iEn == 0 || iEn == 2) {
hit_info[iEn][iSample] += value;
} else if (hit_info[iEn][iSample] == 0) {
} else if (hit_info[iEn][iSample] == 0 || value < hit_info[iEn][iSample]) {
// For iEn==1 the digitizers just set the TOF of the first SimHit
hit_info[iEn][iSample] = value;
}
Expand Down