Changeset 8727 for trunk

Timestamp:

09/03/07 10:37:51 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MEnv.cc (modified) (3 diffs)
• mjobs/MJSpectrum.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MEnv.cc

@@ -41 +41 @@
 // some of the resources.
 //
+// If given paths are not absolute there base is always th elocation of
+// the including file.
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MEnv.h"
@@ -111 +114 @@
         return 0;
 
+    const char *dir = gSystem->DirName(GetRcName());
+
     // Tokenize the array into single files divided by a whitespace
     TObjArray *arr = incl.Tokenize(" ");
@@ -123 +128 @@
     {
         // Get file name to include
-        const char *fenv = (*arr)[i]->GetName();
+        TString fenv = (*arr)[i]->GetName();
+
+        // If the is not anabsolute path we prepend the dir-name
+        // of the including file. This allows that includes
+        // do not necessarily need absolute paths and paths are always
+        // relative to the location of th eincluding file.
+        if (!gSystem->IsAbsoluteFileName(fenv))
+        {
+            fenv.Prepend("/");
+            fenv.Prepend(dir);
+        }
 
         // Read included file and check if its valid

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -1520 +1520 @@
     SetupHistEnergyEst(heest);
 
-    //MHn hdisp("Disp", "Dist residual (Disp-Dist)");
-    //SetupHistDisp(hdisp);
+    MHn hdisp("Disp", "Dist residual (Disp-Dist)");
+    SetupHistDisp(hdisp);
 
     MHn henergy("EvtDist");
@@ -1529 +1529 @@
     fill4b.SetWeight();
 
-    //MFillH fill4c(&hdisp, "", "FillDispResidual");
-    //fill4c.SetWeight();
+    MFillH fill4c(&hdisp, "", "FillDispResidual");
+    fill4c.SetWeight();
+
+    MFDataPhrase fdisp("Disp.fVal*sign(MHillasSrc.fCosDeltaAlpha)<0", "FilterDisp");
+    fill4c.SetFilter(&fdisp);
 
     // ---------------------------------------------------------
@@ -1600 +1603 @@
     tlist2.AddToList(&taskenv0);
     tlist2.AddToList(&taskenv1);
+    tlist2.AddToList(&fdisp);
+    tlist2.AddToList(&fill4c);
     tlist2.AddToList(fCut1);
     tlist2.AddToList(fCutS);