@@ -36,13 +36,13 @@ struct Triggers {
3636 bitVertex,
3737 bitCen,
3838 bitSCen };
39- uint8_t triggersignals; // T0 trigger signals
40- int8_t nChanA; // number of faired channels A side
41- int8_t nChanC; // number of faired channels A side
42- int32_t amplA; // sum amplitude A side
43- int32_t amplC; // sum amplitude C side
44- int16_t timeA; // average time A side
45- int16_t timeC; // average time C side
39+ uint8_t triggersignals = 0 ; // T0 trigger signals
40+ int8_t nChanA = 0 ; // number of fired channels A side
41+ int8_t nChanC = 0 ; // number of fired channels A side
42+ int32_t amplA = - 1000 ; // sum amplitude A side
43+ int32_t amplC = - 1000 ; // sum amplitude C side
44+ int16_t timeA = - 1000 ; // average time A side
45+ int16_t timeC = - 1000 ; // average time C side
4646 Triggers () = default ;
4747 Triggers (uint8_t signals, int8_t chanA, int8_t chanC, int32_t aamplA, int32_t aamplC, int16_t atimeA, int16_t atimeC)
4848 {
@@ -54,11 +54,11 @@ struct Triggers {
5454 timeA = atimeA;
5555 timeC = atimeC;
5656 }
57- bool getOrA () { return (triggersignals & (1 << bitA)) != 0 ; }
58- bool getOrC () { return (triggersignals & (1 << bitC)) != 0 ; }
59- bool getVertex () { return (triggersignals & (1 << bitVertex)) != 0 ; }
60- bool getCen () { return (triggersignals & (1 << bitCen)) != 0 ; }
61- bool getSCen () { return (triggersignals & (1 << bitSCen)) != 0 ; }
57+ bool getOrA () const { return (triggersignals & (1 << bitA)) != 0 ; }
58+ bool getOrC () const { return (triggersignals & (1 << bitC)) != 0 ; }
59+ bool getVertex () const { return (triggersignals & (1 << bitVertex)) != 0 ; }
60+ bool getCen () const { return (triggersignals & (1 << bitCen)) != 0 ; }
61+ bool getSCen () const { return (triggersignals & (1 << bitSCen)) != 0 ; }
6262
6363 void setTriggers (Bool_t isA, Bool_t isC, Bool_t isVrtx, Bool_t isCnt, Bool_t isSCnt, int8_t chanA, int8_t chanC, int32_t aamplA,
6464 int32_t aamplC, int16_t atimeA, int16_t atimeC)
@@ -74,13 +74,11 @@ struct Triggers {
7474 void cleanTriggers ()
7575 {
7676 triggersignals = 0 ;
77- nChanA = nChanC = - 1 ;
77+ nChanA = nChanC = 0 ;
7878 amplA = amplC = -1000 ;
7979 timeA = timeC = -1000 ;
8080 }
8181
82- Triggers getTriggers ();
83-
8482 ClassDefNV (Triggers, 1 );
8583};
8684
@@ -90,7 +88,7 @@ struct Digit {
9088 o2::InteractionRecord mIntRecord ; // Interaction record (orbit, bc)
9189 int mEventID ;
9290 Digit () = default ;
93- Digit (int first, int ne, o2::InteractionRecord iRec, Triggers chTrig, int event)
91+ Digit (int first, int ne, const o2::InteractionRecord& iRec, const Triggers& chTrig, int event)
9492 {
9593 ref.setFirstEntry (first);
9694 ref.setEntries (ne);
@@ -100,7 +98,7 @@ struct Digit {
10098 }
10199 uint32_t getOrbit () const { return mIntRecord .orbit ; }
102100 uint16_t getBC () const { return mIntRecord .bc ; }
103- Triggers getTriggers () { return mTriggers ; }
101+ Triggers getTriggers () const { return mTriggers ; }
104102 int getEventID () const { return mEventID ; }
105103 o2::InteractionRecord getIntRecord () { return mIntRecord ; };
106104 gsl::span<const ChannelData> getBunchChannelData (const gsl::span<const ChannelData> tfdata) const ;
0 commit comments