Changeset 8256 for trunk/MagicSoft/Mars

Timestamp:

01/16/07 13:59:22 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mimage/MHHillasExt.cc (modified) (1 diff)
• mjobs/MSequence.cc (modified) (4 diffs)
• mjobs/MSequence.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
    * mimage/MHHillasExt.cc:
      - call SetDirectory(NULL) after SetName
+
+   * mjobs/MSequence.[h,cc]:
+     - commented out obsolete GetFileNames
 
 

trunk/MagicSoft/Mars/mimage/MHHillasExt.cc

@@ -72 +72 @@
     // connect all the histogram with the container fHist
     //
+    fHAsym.UseCurrentStyle();
+    fHM3Long.UseCurrentStyle();
+    fHM3Trans.UseCurrentStyle();
+    fHMaxDist.UseCurrentStyle();
+
+    fHAsym.SetName("Asymmetry");
+    fHM3Long.SetName("M3l");
+    fHM3Trans.SetName("M3t");
+    fHMaxDist.SetName("MaxDist");
+
+    fHAsym.SetTitle("Asymmetry");
+    fHM3Long.SetTitle("3^{rd} Moment Longitudinal");
+    fHM3Trans.SetTitle("3^{rd} Moment Transverse");
+    fHMaxDist.SetTitle("Distance of max distant pixel");
+
+    fHAsym.SetXTitle("Asym [mm]");
+    fHM3Long.SetXTitle("3^{rd} M_{l} [mm]");
+    fHM3Trans.SetXTitle("3^{rd} M_{t} [mm]");
+    fHMaxDist.SetXTitle("D_{max} [mm]");
+
+    fHAsym.SetYTitle("Counts");
+    fHM3Long.SetYTitle("Counts");
+    fHM3Trans.SetYTitle("Counts");
+    fHMaxDist.SetYTitle("Counts");
+
+    fHAsym.SetFillStyle(4000);
+    fHM3Long.SetFillStyle(4000);
+    fHM3Trans.SetFillStyle(4000);
+    fHMaxDist.SetFillStyle(4000);
+
     fHAsym.SetDirectory(NULL);
     fHM3Long.SetDirectory(NULL);
     fHM3Trans.SetDirectory(NULL);
     fHMaxDist.SetDirectory(NULL);
-
-    fHAsym.UseCurrentStyle();
-    fHM3Long.UseCurrentStyle();
-    fHM3Trans.UseCurrentStyle();
-    fHMaxDist.UseCurrentStyle();
-
-    fHAsym.SetName("Asymmetry");
-    fHM3Long.SetName("M3l");
-    fHM3Trans.SetName("M3t");
-    fHMaxDist.SetName("MaxDist");
-
-    fHAsym.SetTitle("Asymmetry");
-    fHM3Long.SetTitle("3^{rd} Moment Longitudinal");
-    fHM3Trans.SetTitle("3^{rd} Moment Transverse");
-    fHMaxDist.SetTitle("Distance of max distant pixel");
-
-    fHAsym.SetXTitle("Asym [mm]");
-    fHM3Long.SetXTitle("3^{rd} M_{l} [mm]");
-    fHM3Trans.SetXTitle("3^{rd} M_{t} [mm]");
-    fHMaxDist.SetXTitle("D_{max} [mm]");
-
-    fHAsym.SetYTitle("Counts");
-    fHM3Long.SetYTitle("Counts");
-    fHM3Trans.SetYTitle("Counts");
-    fHMaxDist.SetYTitle("Counts");
-
-    fHAsym.SetFillStyle(4000);
-    fHM3Long.SetFillStyle(4000);
-    fHM3Trans.SetFillStyle(4000);
-    fHMaxDist.SetFillStyle(4000);
 
     fHM3Trans.SetLineColor(kBlue);

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -346 +346 @@
 // Read the file fname as setup file for the sequence.
 //
-void MSequence::GetFileNames(TEnv &env, const TArrayI &arr)
-{
+//void MSequence::GetFileNames(TEnv &env, const TArrayI &arr)
+//{
     /*
     for (int i=0; i<arr.GetSize(); i++)
@@ -362 +362 @@
         }
         */
-}
+//}
 
 // --------------------------------------------------------------------------
@@ -368 +368 @@
 // Get a file name corresponding to the run-number num, returns 0 if n/a
 //
-const char *MSequence::GetFileName(UInt_t num)
-{
-    return 0;
+//const char *MSequence::GetFileName(UInt_t num)
+//{
+//    return 0;
     /*
     TString *str = (TString*)fFileNames.GetValue(num);
     return str ? str->Data() : 0;*/
-}
+//}
 
 MSequence::LightCondition_t MSequence::ReadLightCondition(TEnv &env) const
@@ -452 +452 @@
     Split(str, fDatRuns);
 
-    GetFileNames(env, fRuns);
-    GetFileNames(env, fCalRuns);
-    GetFileNames(env, fPedRuns);
-    GetFileNames(env, fDatRuns);
+  //  GetFileNames(env, fRuns);
+  //  GetFileNames(env, fCalRuns);
+  //  GetFileNames(env, fPedRuns);
+  //  GetFileNames(env, fDatRuns);
 
     // Dummies:

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -54 +54 @@
 
     void Split(TString &runs, TArrayI &data) const;
-    void GetFileNames(TEnv &env, const TArrayI &arr);
+    //void GetFileNames(TEnv &env, const TArrayI &arr);
     LightCondition_t ReadLightCondition(TEnv &env) const;