Skip to content

Commit cc21610

Browse files
Renamed sbn::ExtraTriggerInfo::Cryostat::SectorStatus into sectorStatus
Following the standard naming rule. This is a breaking change. I am not adding a I/O rule because I think no data was produced with the old class. One can be added at any time.
1 parent ccea6c6 commit cc21610

4 files changed

Lines changed: 11 additions & 10 deletions

File tree

sbnobj/Common/Trigger/BeamBits.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ namespace sbn {
184184
std::string bitName(triggerType bit);
185185
/// Returns a mnemonic short name for the trigger window mode.
186186
std::string bitName(triggerWindowMode bit);
187-
/// Returns a mnemonic short name for the trigger window mode.
187+
/// Returns a mnemonic short name for the gate type.
188188
std::string bitName(gateSelection bit);
189189

190190
/// @}

sbnobj/Common/Trigger/ExtraTriggerInfo.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,11 @@ std::ostream& sbn::operator<< (std::ostream& out, ExtraTriggerInfo const& info)
217217
<< "\n east wall: "
218218
<< dumpLVDSmask(cryo.LVDSstatus[ExtraTriggerInfo::EastPMTwall])
219219
<< ", sectors: "
220-
<< dumpBits(cryo.SectorStatus[ExtraTriggerInfo::EastPMTwall], 6)
220+
<< dumpBits(cryo.sectorStatus[ExtraTriggerInfo::EastPMTwall], 6)
221221
<< "\n west wall: "
222222
<< dumpLVDSmask(cryo.LVDSstatus[ExtraTriggerInfo::WestPMTwall])
223223
<< ", sectors: "
224-
<< dumpBits(cryo.SectorStatus[ExtraTriggerInfo::WestPMTwall], 6)
224+
<< dumpBits(cryo.sectorStatus[ExtraTriggerInfo::WestPMTwall], 6)
225225
;
226226
}
227227

@@ -235,11 +235,11 @@ std::ostream& sbn::operator<< (std::ostream& out, ExtraTriggerInfo const& info)
235235
<< "\n east wall: "
236236
<< dumpLVDSmask(cryo.LVDSstatus[ExtraTriggerInfo::EastPMTwall])
237237
<< ", sectors: "
238-
<< dumpBits(cryo.SectorStatus[ExtraTriggerInfo::EastPMTwall], 6)
238+
<< dumpBits(cryo.sectorStatus[ExtraTriggerInfo::EastPMTwall], 6)
239239
<< "\n west wall: "
240240
<< dumpLVDSmask(cryo.LVDSstatus[ExtraTriggerInfo::WestPMTwall])
241241
<< ", sectors: "
242-
<< dumpBits(cryo.SectorStatus[ExtraTriggerInfo::WestPMTwall], 6)
242+
<< dumpBits(cryo.sectorStatus[ExtraTriggerInfo::WestPMTwall], 6)
243243
;
244244
}
245245

sbnobj/Common/Trigger/ExtraTriggerInfo.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ struct sbn::ExtraTriggerInfo {
238238
*
239239
* The remaining 10 bits are reserved for future use.
240240
*/
241-
std::array<std::uint16_t, MaxWalls> SectorStatus { 0U, 0U };
241+
std::array<std::uint16_t, MaxWalls> sectorStatus { 0U, 0U };
242242

243243
/// Returns whether there is some recorded LVDS activity.
244244
constexpr bool hasLVDS() const;
@@ -254,7 +254,7 @@ struct sbn::ExtraTriggerInfo {
254254

255255
/// Bits for the trigger location (see `triggerLocation()`).
256256
unsigned int triggerLocationBits { 0U };
257-
//sbn::triggerLocation triggerLocationBits { sbn::triggerSource::NBits }
257+
258258
/// Status of each LVDS channel in each PMT wall at trigger time.
259259
std::array<CryostatInfo, MaxCryostats> cryostats;
260260

@@ -288,7 +288,7 @@ struct sbn::ExtraTriggerInfo {
288288
/// Returns sector states on a PMT `wall` of the specified `cryostat`.
289289
/// @throws std::out_of_range if invalid `cryostat` or `wall`
290290
std::uint16_t SectorInfo(std::size_t cryostat, std::size_t wall) const
291-
{ return cryostatInfo(cryostat).SectorStatus.at(wall); }
291+
{ return cryostatInfo(cryostat).sectorStatus.at(wall); }
292292

293293
/// @}
294294
// --- END ---- Trigger topology ---------------------------------------------
@@ -341,7 +341,7 @@ inline constexpr bool sbn::ExtraTriggerInfo::CryostatInfo::hasLVDS() const {
341341
inline constexpr bool sbn::ExtraTriggerInfo::CryostatInfo::hasSectors() const {
342342
// C++20:
343343
// return std::ranges::any_of(SectorStatus, std::identity{});
344-
for (std::uint64_t bits: SectorStatus) if (bits) return true;
344+
for (std::uint64_t bits: sectorStatus) if (bits) return true;
345345
return false;
346346
} // sbn::ExtraTriggerInfo::CryostatInfo::hasSectors()
347347

sbnobj/Common/Trigger/classes_def.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
<enum name="sbn::bits::triggerSource" ClassVersion="10" />
2828
<enum name="sbn::bits::triggerLocation" ClassVersion="10" />
2929
<enum name="sbn::bits::triggerType" ClassVersion="10" />
30-
<class name="sbn::ExtraTriggerInfo::CryostatInfo" ClassVersion="11" >
30+
<class name="sbn::ExtraTriggerInfo::CryostatInfo" ClassVersion="12" >
31+
<version ClassVersion="12" checksum="804951501"/>
3132
<version ClassVersion="11" checksum="3455337645"/>
3233
<version ClassVersion="10" checksum="313789291"/>
3334
</class>

0 commit comments

Comments
 (0)