Changeset 19993 for trunk/Mars/mmc/MMcEvt.cxx

Timestamp:

09/21/20 11:22:10 (4 years ago)

Author:

tbretz

Message:

Adapted getter and setter.

File:

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

trunk/Mars/mmc/MMcEvt.cxx

@@ -18 +18 @@
 !   Author(s):
 !
-!   Copyright: MAGIC Software Development, 2000-2007
+!   Copyright: MAGIC Software Development, 2000-2020
 !
 !
@@ -127 +127 @@
 void MMcEvt::Clear(Option_t *opt)
 {
+    MMcEvtBasic::Clear();
+
     fRunNumber = 0;
 
-    fPartId = kUNDEFINED;
-    fEnergy = -1;
-
     fCoreD  =  0;
-    fCoreX  =  0;
-    fCoreY  =  0;
-    fImpact = -1;
 
     fPhotIni          = 0;
@@ -282 +278 @@
     if (!fin.SetRefAddress("MMcEvt.fZFirstInteraction", fZFirstInteraction))  return kFALSE;
     if (!fin.SetRefAddress("MMcEvt.fCoreD",             fCoreD            ))  return kFALSE;
-    if (!fin.SetRefAddress("MMcEvt.fCoreX",             fCoreX            ))  return kFALSE;
-    if (!fin.SetRefAddress("MMcEvt.fCoreY",             fCoreY            ))  return kFALSE;
     if (!fin.SetRefAddress("MMcEvt.fTimeFirst",         fTimeFirst        ))  return kFALSE;
     if (!fin.SetRefAddress("MMcEvt.fTimeLast",          fTimeLast         ))  return kFALSE;
@@ -310 +304 @@
             return kFALSE;
 
+    // Written to MmcEvtBasic for MMcEvt > V8
+    if (fin.HasColumn("MMcEvt.fCoreX"))
+        if (!fin.SetRefAddress("MMcEvt.fCoreX", fCoreX))
+            return kFALSE;
+
+    if (fin.HasColumn("MMcEvt.fCoreY"))
+        if (!fin.SetRefAddress("MMcEvt.fCoreY", fCoreY))
+            return kFALSE;
+
     return MMcEvtBasic::SetupFits(fin);
 }