Repository navigation
FITS loader fix - #288
FITS loader fix#288mwy-wing wants to merge 7 commits into
Conversation
|
Probably irrelevant, but do we also need a check if a detector exists in the geometry or not for the FITS loader? |
|
Hi Wing, Thanks! Before I give a full review, I'm just realizing now from you message in issue #270 (#270 (comment)) that you're not using the EventType (Event Type) parameter in the L0 or FITS data loader. In the L0 data, you're saving parameter etype and in the FITS loader you have variable eventType, but they're both unused. The Event Type details the veto type based on Table 36 in the FEE ICD and the EVENTTYPE table that's immediate after the L1a FITS data format in the HEASARC ICD. Here's a screenshot from the FEE ICD for your quick reference:
Note that the non-vetoed events have event type 0x00-0x02, the guard ring vetoed events have 0x03-0x05, the hard veto ACS events have 0x06-0x08 and the soft vetoed events have 0x09-0x0B. You should be using this parameter to define whether or not an event had a Veto, and filling the SetGuardRingVeto and SetShieldVeto methods, as appropriate. So, instead of your boolean flag for GuardRingVeto defined in MModuleLoaderMeasurementsFITS.cxx line 361 being defined by the HitType: We don't currently distinguish between Soft vetos and Hard vetos in nuclearizer, but I think we'll want to eventually. You're welcome to introduce the new variables now, if you want to, or you can just use the SetShieldVeto option for both, and I'll add an issue to include SoftVetos in Nuclearizer. |

Fixed issue #265. All problems described in the issue have been resolved, and unit tests pass on both macOS and Linux.