Changeset 9596 for trunk

Timestamp:

06/24/10 16:42:52 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/include-Classes/MMcFormat

Files:

• MMcEvt.cxx (modified) (2 diffs)
• MMcEvtBasic.cc (modified) (3 diffs)

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx

@@ -52 +52 @@
 //   - added fEventReuse
 //
+// Version 7:
+//  - moved fPhi   to MMcEvtBasic
+//  - moved fTheta to MmcEvtBasic
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MMcEvt.hxx"
@@ -116 +120 @@
     fPartId = kUNDEFINED;
     fEnergy = -1;
-
-    fTheta = 0;
-    fPhi   = 0;
 
     fCoreD  =  0;

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.cc

@@ -49 +49 @@
 //  - replaced MMcEvt::ParticleId_t by ParticleId_t
 //
+// Version 3:
+//  - moved fPhi   from MMcEvt
+//  - moved fTheta from MmcEvt
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MMcEvtBasic.h"
@@ -81 +85 @@
 //
 MMcEvtBasic::MMcEvtBasic(ParticleId_t usPId, Float_t fEner,
-                         Float_t fImpa, Float_t fTPhii, Float_t fTThet)
+                         Float_t fImpa, Float_t fTPhii, Float_t fTThet)
+   : fPartId(usPId), fEnergy(fEner), fImpact(fImpa),
+     fTelescopePhi(fTPhii), fTelescopeTheta(fTThet), fTheta(0), fPhi(0)
 {
     fName  = "MMcEvtBasic";
     fTitle = "Basic event info from Monte Carlo";
-
-    Fill(usPId, fEner, fImpa, fTPhii, fTThet);
 }
 
@@ -100 +104 @@
     fTelescopePhi   = evt.fTelescopePhi;
     fTelescopeTheta = evt.fTelescopeTheta;
-}
-
-// --------------------------------------------------------------------------
-//
-//  Reset all values: Fill(kUNDEFINED, -1, -1, 0, 0)
+    fPhi            = evt.fPhi;
+    fTheta          = evt.fTheta;
+}
+
+// --------------------------------------------------------------------------
+//
+//  Reset all values.
 //
 void MMcEvtBasic::Clear(Option_t *opt)
 {
-    Fill(kUNDEFINED, -1, -1, 0, 0);
+    fPartId         = kUNDEFINED;
+
+    fEnergy         = -1;
+    fImpact         = -1;
+
+    fTelescopePhi   = 0;
+    fTelescopeTheta = 0;
+
+    fTheta          = 0;
+    fPhi            = 0;
 }