Changeset 2689 for trunk

Timestamp:

12/17/03 15:49:05 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfilter/MFGeomag.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -11 +11 @@
    * mfilter/MFGeomag.cc:
      - added kPOSITRON and kELECTRON as possible particle ids.
-
+     - added fResult = 0 for the case kGAMMA,  !fGamm_elec, to let
+       real gammas be accepted by the filter.
 
  2003/12/17: Thomas Bretz

trunk/MagicSoft/Mars/mfilter/MFGeomag.cc

@@ -49 +49 @@
 #include "MMcEvt.hxx"
 
+#include <TSystem.h>
 
 ClassImp(MFGeomag);
@@ -84 +85 @@
     Float_t azim  [2*1152];      // (these variables not used)
     Float_t thet  [2*1152];
+
     ifstream geomagp;
-    geomagp.open("mfilter/gcplus.txt");
+
+    TString filename = gSystem->Getenv("MARSSYS");
+    filename += "/mfilter/gcplus.txt";
+
+    geomagp.open(filename);
     if (!geomagp) {
         *fLog << err <<" ERROR gcplus.txt file not found by Geomag"<<endl;
@@ -101 +107 @@
     geomagp.close();
     geomagp.clear();
+
     ifstream geomagm;
-    geomagm.open("mfilter/gcminus.txt");
+
+    filename = gSystem->Getenv("MARSSYS");
+    filename += "/mfilter/gcminus.txt";
+
+    geomagm.open(filename);
     if (!geomagm) {
         *fLog << err <<" ERROR gcminus.txt file not found by Geomag"<<endl;
@@ -151 +162 @@
     case kGAMMA:
         if (!fGamm_elec)         //accept gammas if not set to electrons
-            return kTRUE;
+          {
+            fResult = 0;
+            return kTRUE;
+          }
         indadd = 1152;           //second part of table (negative particles)
         break;