Changeset 8315 for trunk

Timestamp:

02/13/07 11:15:29 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/callisto_Dec04Jan05.rc (modified) (2 diffs)
• Mars/macros/tutorials/disprfl.C (added)
• Mars/manalysis/MParameterCalc.cc (modified) (1 diff)
• Mars/mbase/MLog.h (modified) (2 diffs)
• Mars/mdata/MDataPhrase.h (modified) (1 diff)
• Mars/mfileio/MReadRflFile.cc (modified) (7 diffs)
• Mars/mfileio/MReadRflFile.h (modified) (2 diffs)
• Mars/mjobs/MJPedestal.cc (modified) (2 diffs)
• Mars/mpointing/MPointingDevCalc.h (modified) (1 diff)
• Mars/mreflector/MHReflector.cc (added)
• Mars/mreflector/MHReflector.h (added)
• Mars/mreflector/Makefile (modified) (1 diff)
• Mars/mreflector/ReflectorLinkDef.h (modified) (1 diff)
• include-Classes/MMcFormat/MMcEvtBasic.h (modified) (1 diff)

trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

@@ -218 +218 @@
 # Use this if you want to change the higain-vs. logain intercalibration
 # -------------------------------------------------------------------------
-MJCalibration.HiLoCalibFile:    mjobs/hilocalib_sp1.root
+MJCalibration.HiLoCalibFile:    resources/hilocalib_sp1.rc
 #MJCalibration.HiLoCalibration:  yes
 
@@ -334 +334 @@
 # -------------------------------------------------------------------------
 #MJPedestalY2.PulsePosCheck: yes
-#MJPedestalY2.ExtractWinLeft:  0.0
+#MJPedestalY2.ExtractWinLeft:  0.0 
 #MJPedestalY2.ExtractWinRight: 0.0
 

trunk/MagicSoft/Mars/manalysis/MParameterCalc.cc

@@ -200 +200 @@
     fData = f;
 
-    if (!fData->IsValid())
+    if (!f->HasValidRule())
     {
         *fLog << err << "MParameterCalc::ReadEnv - ERROR: Inavlid rule from resource file." << endl;

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -1 +1 @@
 /* ======================================================================== *\
-!  $Name: not supported by cvs2svn $:$Id: MLog.h,v 1.36 2006-10-17 14:11:36 tbretz Exp $
+!  $Name: not supported by cvs2svn $:$Id: MLog.h,v 1.37 2007-02-13 11:06:53 tbretz Exp $
 \* ======================================================================== */
 #ifndef MARS_MLog
@@ -220 +220 @@
             const Int_t l = (78-str.Length())/2-3;
             str.Prepend("={ ");
-            str.Prepend('-', l);
+            str.Prepend('-', l<1?1:l);
             str.Append(" }=");
-            str.Append('-', l);
+            str.Append('-', l<1?1:l);
         }
         if (str.Length()<78)

trunk/MagicSoft/Mars/mdata/MDataPhrase.h

@@ -45 +45 @@
     // MData
     Bool_t   IsValid() const;
+    Bool_t   HasValidRule() const { return fFormula ? kTRUE : kFALSE; }
     Double_t GetValue() const;
     TString  GetRule() const;

trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc

@@ -33 +33 @@
 
 #include <errno.h>
-#include <fstream>
 
 #include <TSystem.h>
@@ -39 +38 @@
 #include "structures_rfl.h"
 
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MZlib.h"
+
 #include "MParList.h"
+
 #include "MRflEvtData.h"
 #include "MRflEvtHeader.h"
@@ -45 +50 @@
 #include "MRflSinglePhoton.h"
 
-#include "MLog.h"
-#include "MLogManip.h"
 
 ClassImp(MReadRflFile);
@@ -185 +188 @@
                 *fLog << inf << "FIXME: Call ReInit" << endl;
 
+                // FIXME: fRunHeader->Read(fIn);
+                //        fRunHeader->Print();
+
                 fRunHeader->SetRunNumber((int)rrunh.RunNumber);
                 *fLog << underline << "RunHeader:" << endl;
-                *fLog << " Run Number:   " << rrunh.RunNumber << endl;
-                *fLog << " Date:         " << rrunh.date << endl;
-                *fLog << " Corsika Ver.: " << rrunh.Corsika_version << endl;
-
+                *fLog << " Run Number:    " << rrunh.RunNumber << endl;
+                *fLog << " Date:          " << rrunh.date << endl;
+                *fLog << " Corsika Ver.:  " << rrunh.Corsika_version << endl;
+                *fLog << " Energy Range:  " << rrunh.ELowLim << "GeV to " << rrunh.EUppLim << "GeV" << endl;
+                *fLog << " Energy Slope:  " << rrunh.SlopeSpec << endl;
+                *fLog << " Wobble Mode:   " << rrunh.wobble_mode << endl;
+                *fLog << " Atm. Model:    " << rrunh.atmospheric_model << endl;
+                // *fLog << " Theta Range:   " << rrunh.ThetaMin << "deg to " << rrunh.ThetaMax << "deg" << endl;
+                // *fLog << " Phi Range:     " << rrunh.PhiMin << "deg to " << rrunh.PhiMax << "deg" << endl;
+                // *fLog << " View Cone Rad: " << rrunh.ViewconeRadius << "deg" << endl;
                 break;
             }
@@ -196 +208 @@
             *fLog << err << "Error! found end of file... But no EOF flag. Exiting." << endl;
             return kError;
-        }
+        }/*
+        else
+        {
+            *fLog << err << "ERROR - Reflector versions <= 0.5 are not supported!" << endl;
+            return kError;
+        }*/
         return kUndefined;
 
@@ -299 +316 @@
     //
     fFileName = file->GetName();
-    const TString expname = fFileName;
+    TString expname = fFileName;
     gSystem->ExpandPathName(expname);
 
@@ -309 +326 @@
     *fLog << inf << "Open file: '" << fFileName << "'" << endl;
 
-    fIn = new ifstream(expname);
+    fIn = new MZlib(expname);
     if (!*fIn)
     {

trunk/MagicSoft/Mars/mfileio/MReadRflFile.h

@@ -10 +10 @@
 #endif
 
+class MZlib;
 class TList;
 class MRflEvtData;
@@ -28 +29 @@
     };
 
-    ifstream *fIn;              // the inputfile
-    TList    *fFileNames;       // Array which stores the \0-terminated filenames
+    MZlib *fIn;              // the inputfile
+    TList *fFileNames;       // Array which stores the \0-terminated filenames
 
     MRflEvtData   *fEvtData;    //!

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -1050 +1050 @@
     plist.AddToList(&fBadPixels);
     
-    //
-    // Read bad pixels from outside
-    // 
-    if (!fBadPixelsFile.IsNull())
-    {
-        *fLog << inf << "Excluding: " << fBadPixelsFile << endl;
-        ifstream fin(fBadPixelsFile);
-        fBadPixels.AsciiRead(fin);
-    }
-
     MGeomApply geomapl;
     MBadPixelsMerge merge(&fBadPixels);
@@ -1094 +1084 @@
         fExtractor->Print();
         *fLog << endl;
+    }
+
+    //
+    // Read bad pixels from outside
+    // 
+    if (!fBadPixelsFile.IsNull())
+    {
+        *fLog << inf << "Excluding: " << fBadPixelsFile << endl;
+        ifstream fin(fBadPixelsFile);
+        fBadPixels.AsciiRead(fin);
     }
 

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.h

@@ -52 +52 @@
 
 public:
-    MPointingDevCalc() : fReport(0), fDeviation(0), fSkip(6), fNumMinStars(8),
+    MPointingDevCalc() : fReport(0), fDeviation(0), fSkip(7), fNumMinStars(8),
         fNsbLevel(3), fNsbMin(30), fNsbMax(60), fMaxAbsDev(15), fMaxAge(1), fDx(-7), fDy(16)
     {

trunk/MagicSoft/Mars/mreflector/Makefile

@@ -19 +19 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mgui -I../mgeom
+INCLUDES = -I. -I../mbase -I../mgui -I../mgeom -I../mhbase
 
 SRCFILES = MRflEvtData.cc \
            MRflEvtHeader.cc \
            MRflRunHeader.cc \
-           MRflSinglePhoton.cc
+           MRflSinglePhoton.cc \
+           MHReflector.cc
 
 ############################################################

trunk/MagicSoft/Mars/mreflector/ReflectorLinkDef.h

@@ -10 +10 @@
 #pragma link C++ class MRflSinglePhoton+;
 
+#pragma link C++ class MHReflector+;
+
 #endif

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

@@ -91 +91 @@
   }
 
+  static TString GetEnergyStr(Float_t e)
+  {
+      if (e>=1000)
+          return Form("%.1fTeV", e/1000);
+
+      if (e>=10)
+          return Form("%dGeV", (Int_t)(e+.5));
+
+      if (e>=1)
+          return Form("%.1fGeV", e);
+
+      return Form("%dMeV", (Int_t)(e*1000+.5));
+  }
+
   TString GetEnergyStr() const
   {
-      if (fEnergy>1000)
-          return Form("%.1fTeV", fEnergy/1000);
-
-      if (fEnergy>10)
-          return Form("%dGeV", (Int_t)(fEnergy+.5));
-
-      if (fEnergy>1)
-          return Form("%.1fGeV", fEnergy);
-
-      return Form("%dMeV", (Int_t)(fEnergy*1000+.5));
+      return GetEnergyStr(fEnergy);
   }
-
 
   // Setter