Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class Digitizer : public TObject
double getEventTime() const { return mDigits.getEventTime(); }
bool isLive(double t) const { return mDigits.isLive(t); }
bool isLive() const { return mDigits.isLive(); }
bool isCurrentEventTriggered() const { return mDigits.isCurrentEventTriggered(); }

void setDebugStreaming(bool doStreaming) { mEnableDebugStreaming = doStreaming; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,21 @@ class DigitsWriteoutBuffer

double getTriggerTime() const { return mTriggerTime; }
double getEventTime() const { return mLastEventTime; }
bool isLive(double t) const { return ((t - mTriggerTime) < mLiveTime || (t - mTriggerTime) >= (mLiveTime + mBusyTime - mPreTriggerTime)); }
bool isLive() const { return ((mLastEventTime - mTriggerTime) < mLiveTime || (mLastEventTime - mTriggerTime) >= (mLiveTime + mBusyTime - mPreTriggerTime)); }
bool isLive(double t) const
{
return ((t - mTriggerTime) < mLiveTime || (t - mTriggerTime) >= (mLiveTime + mBusyTime - mPreTriggerTime));
}
bool isLive() const
{
return ((mLastEventTime - mTriggerTime) < (mLiveTime - mPreTriggerTime) || (mLastEventTime - mTriggerTime) >= (mLiveTime + mBusyTime - mPreTriggerTime));
}

/// Check if current collision was triggered
/// \return true if event was triggered
bool isCurrentEventTriggered() const
{
return mLastEventTime == mTriggerTime;
}

// function returns true if the collision occurs 600ns before the readout window is open
// Look here for more details https://alice.its.cern.ch/jira/browse/EMCAL-681
Expand Down
12 changes: 7 additions & 5 deletions Detectors/EMCAL/workflow/src/EMCALDigitizerSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -332,15 +332,17 @@ void DigitizerSpec::run(framework::ProcessingContext& ctx)
if (!trigger.any()) {
continue;
}
// Trigger sim: Prepare CTP input digit
acceptedTriggers.push_back(std::make_tuple(timesview[collID], trigger));
LOG(debug) << "EMCAL TRU simulation: Sending trg = " << trigger << " to CTP";

mDigitizer.setEventTime(timesview[collID], trigger.any());

if (!mDigitizer.isLive()) {
if (!mDigitizer.isCurrentEventTriggered()) {
LOG(debug) << "reject collision";
continue;
}
LOG(debug) << "accept collision";

// Trigger sim: Prepare CTP input digit
acceptedTriggers.push_back(std::make_tuple(timesview[collID], trigger));
LOG(debug) << "EMCAL TRU simulation: Sending trg = " << trigger << " to CTP";

// for each collision, loop over the constituents event and source IDs
// (background signal merging is basically taking place here)
Expand Down