Changeset 19955 for trunk/Mars

Timestamp:

05/04/20 10:58:15 (5 years ago)

Author:

tbretz

Message:

Reset fRunNumber in Clear for deft constructor and allow fRunNumber to be missing in FITS file.

File:

• trunk/Mars/mmc/MMcEvt.cxx (modified) (2 diffs)

trunk/Mars/mmc/MMcEvt.cxx

@@ -274 +274 @@
 
     if (!fin.SetRefAddress("MMcEvt.fEvtNumber",         fEvtNumber        ))  return kFALSE;
-    if (!fin.SetRefAddress("MMcEvt.fRunNumber",         fRunNumber        ))  { /* not in files < v7 */ }
     if (!fin.SetRefAddress("MMcEvt.fThick0",            fThick0           ))  return kFALSE;
     if (!fin.SetRefAddress("MMcEvt.fFirstTarget",       fFirstTarget      ))  return kFALSE;
@@ -302 +301 @@
     if (!fin.SetRefAddress("MMcEvt.fEventReuse",        fEventReuse       ))  return kFALSE;
 
+    // Not in files written from MMcEvt < V8
+    if (fin.HasColumn("MMcEvt.fRunNumber"))
+        if (!fin.SetRefAddress("MMcEvt.fRunNumber", fRunNumber))
+            return kFALSE;
+
     return MMcEvtBasic::SetupFits(fin);
 }