Changeset 19993 for trunk/Mars/mmc/MMcEvtBasic.cc

Timestamp:

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

Author:

tbretz

Message:

Adapted getter and setter.

File:

• trunk/Mars/mmc/MMcEvtBasic.cc (modified) (6 diffs)

trunk/Mars/mmc/MMcEvtBasic.cc

@@ -18 +18 @@
 !   Author(s): Abelardo Moralejo, 02/2005 <mailto:moralejo@pd.infn.it>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2020
 !
 !
@@ -93 +93 @@
                          Float_t fImpa, Float_t fTPhii, Float_t fTThet)
    : fPartId(usPId), fEnergy(fEner), fImpact(fImpa),
-     fTelescopePhi(fTPhii), fTelescopeTheta(fTThet), fTheta(0), fPhi(0)
+     fTelescopePhi(fTPhii), fTelescopeTheta(fTThet), fTheta(0), fPhi(0), fCoreX(0), fCoreY(0)
 {
     fName  = "MMcEvtBasic";
@@ -112 +112 @@
     fPhi            = evt.fPhi;
     fTheta          = evt.fTheta;
+    fCoreX          = evt.fCoreX;
+    fCoreY          = evt.fCoreY;
 }
 
@@ -130 +132 @@
     fTheta          = 0;
     fPhi            = 0;
+
+    fCoreX          = 0;
+    fCoreY          = 0;
 }
 
@@ -237 +242 @@
         *fLog << "Energy: " << fEnergy << "GeV" << endl;
     if (str.Contains("impact", TString::kIgnoreCase))
-        *fLog << "Impact: " << fImpact << "cm" << endl;
+        *fLog << "Impact: " << fImpact << "cm [x=" << fCoreX << ", y=" << fCoreY << "]" << endl;
 }
 
@@ -256 +261 @@
     if (!fin.SetRefAddress("MMcEvtBasic.fPhi",            fPhi           ))  return kFALSE;
 
+    // Written to MMcEvt for MMcEvtBasic < V4
+    if (fin.HasColumn("MMcEvtBasic.fCoreX"))
+        if (!fin.SetRefAddress("MMcEvtBasic.fCoreX", fCoreX))
+            return kFALSE;
+
+    if (fin.HasColumn("MMcEvtBasic.fCoreY"))
+        if (!fin.SetRefAddress("MMcEvtBasic.fCoreY", fCoreY))
+            return kFALSE;
+
     return kTRUE;
 }