Changeset 3325 for trunk/MagicSoft/Mars/mfilter

Timestamp:

02/26/04 10:55:25 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MFGeomag.cc (modified) (3 diffs)
• MFParticleId.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mfilter/MFGeomag.cc

@@ -36 +36 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-
 #include "MFGeomag.h"
 
@@ -156 +155 @@
     switch (fMcEvt->GetPartId())
     {
-    case kGAMMA:
+    case MMcEvt::kGAMMA:
         if (!fGammaElectron)     //accept gammas if not set to electrons
             return kTRUE;
@@ -162 +161 @@
         break;
 
-    case kHELIUM:
+    case MMcEvt::kHELIUM:
         rig /= 2;                //double charge
         break;
 
-    case kPROTON:                //protons
-    case kPOSITRON:              //positrons
-        break;
-
-    case kELECTRON:              //electrons
+    case MMcEvt::kPROTON:                //protons
+    case MMcEvt::kPOSITRON:              //positrons
+        break;
+
+    case MMcEvt::kELECTRON:              //electrons
         indadd = 1152;           //second part of table (negative particles)
         break;

trunk/MagicSoft/Mars/mfilter/MFParticleId.cc

@@ -140 +140 @@
     switch (fValue)
     {
-    case kGAMMA:
-        out << "kGAMMA";
-        break;
-    case kPROTON:
-        out << "kPROTON";
-        break;
-    case kHELIUM:
-        out << "kHELIUM";
-        break;
-    case kOXYGEN:
-        out << "kOXYGEN";
-        break;
-    case kIRON:
-        out << "kIRON";
-        break;
+    case MMcEvt::kGAMMA:    out << "MMcEvt::kGAMMA";    break;
+    case MMcEvt::kPOSITRON: out << "MMcEvt::kPOSITRON"; break;
+    case MMcEvt::kELECTRON: out << "MMcEvt::kELECTRON"; break;
+    case MMcEvt::kPROTON:   out << "MMcEvt::kPROTON";   break;
+    case MMcEvt::kHELIUM:   out << "MMcEvt::kHELIUM";   break;
+    case MMcEvt::kOXYGEN:   out << "MMcEvt::kOXYGEN";   break;
+    case MMcEvt::kIRON:     out << "MMcEvt::kIRON";     break;
     default:
         out << fValue;