Changeset 1880 for trunk/MagicSoft

Timestamp:

03/31/03 10:37:56 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• Makefile.conf.linux (modified) (1 diff)
• NEWS (modified) (1 diff)
• manalysis/MImgCleanStd.cc (modified) (3 diffs)
• manalysis/MImgCleanStd.h (modified) (2 diffs)
• manalysis/MNewImagePar.cc (modified) (2 diffs)
• manalysis/MNewImagePar.h (modified) (2 diffs)
• manalysis/MNewImageParCalc.cc (modified) (1 diff)
• manalysis/MNewImageParCalc.h (modified) (1 diff)
• manalysis/MRanForest.cc (modified) (1 diff)
• manalysis/MSigmabar.cc (modified) (5 diffs)
• mbase/MEvtLoop.cc (modified) (3 diffs)
• mbase/MEvtLoop.h (modified) (2 diffs)
• mbase/MParContainer.cc (modified) (4 diffs)
• mbase/MParContainer.h (modified) (3 diffs)
• mbase/MParList.cc (modified) (1 diff)
• mbase/MParList.h (modified) (1 diff)
• mbase/MTaskList.cc (modified) (1 diff)
• mbase/MTaskList.h (modified) (1 diff)
• mfileio/MCT1ReadAscii.cc (modified) (2 diffs)
• mfileio/MCT1ReadAscii.h (modified) (1 diff)
• mfileio/MCT1ReadPreProc.cc (modified) (4 diffs)
• mfileio/MCT1ReadPreProc.h (modified) (1 diff)
• mfileio/MRead.cc (modified) (1 diff)
• mfileio/MRead.h (modified) (1 diff)
• mgui/MHexagon.cc (modified) (1 diff)
• mgui/MHexagon.h (modified) (1 diff)
• mhist/MH.cc (modified) (4 diffs)
• mhist/MHRanForest.cc (modified) (4 diffs)
• mhist/MHRanForestGini.cc (modified) (3 diffs)
• mhist/MHRanForestGini.h (modified) (1 diff)
• mmontecarlo/MMcTriggerRateCalc.cc (modified) (8 diffs)
• mtools/MagicReversi.cc (added)
• mtools/MagicReversi.h (added)
• mtools/Makefile (modified) (1 diff)
• mtools/ToolsLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/03/31: Thomas Bretz
+ 
+   * Makefile.conf.linux:
+     - removed -fno-rtti to make it compatible with root 3.04.02
+   
+   * NEWS:
+     - changed
+   
+   * manalysis/MImgCleanStd.[h,cc]:
+     - added SetLvl1
+     - added SetLvl2
+     - added ReadEnv
+   
+   * manalysis/MNewImagePar.[h,cc]:
+     - removed unnecessary fHillas data member
+     - removed unnecessary fSrcPos data member
+     - removed unnecessary Set/GetSrcPos 
+   
+   * manalysis/MNewImageParCalc.[h,cc]:
+     - removed unnecessary SetSrcPos 
+     - removed const-qualifier from fGeomCam, fCerPhotEvt
+       (trouble with root 3.02/06)
+   
+   * manalysis/MRanForest.cc:
+     - changed cout-output
+     
+   * manalysis/MSigmabar.cc:
+     - changed Area to area (local variable)
+
+   * mbase/MEvtLoop.[h,cc]:
+     - added evtloop name to constructor (default=Evtloop)
+     - adapted StreamPrimitive
+     - added ReadEnv
+     - added WriteEnv
+     
+   * mbase/MParContainer.[h,cc]:
+     - removed TROOT.h
+     - fixed const-qualifier for Copy-function for root>3.04.01
+     - added ReadEnv
+     - added WriteEnv
+     - added IsEnvDefined
+     - added GetEnvValue
+     
+   * mbase/MParList.[h,cc], mbase/MTaskList.[h,cc]:
+     - added ReadEnv
+     - added WriteEnv
+   
+   * mfileio/MCT1ReadAscii.[h,cc], mfileio/MCT1ReadPreProc.[h,cc]:
+     - changed AddFile declaration to declaration in MRead
+     - added return value to AddFile
+     
+   * mfileio/MRead.[h,cc]:
+     - added template for AddFile
+     - added ReadEnv
+     
+   * mgui/MHexagon.[h,cc]:
+     - fixed const-qualifier for Copy-function for root>3.04.01
+   
+   * mhist/MH.cc:
+     - fixed the FindGoodLimit stuff for root> 3.04.01
+     
+   * mhist/MHRanForest.[h,cc], mhist/MHRanForestGini.[h,cc]:
+     - removed unnecessary casts
+     - fixed a copilation error with root 3.04.01 (kFullDotlarge 
+       doesn't exist)
+     - removed second Draw (one should not add something twice to 
+       the pad)
+       
+   * mmontecarlo/MMcTriggerRateCalc.cc:
+     - changes to the header
+     - changes to the fLog stuff
+     - added a cast to get rid of a warning
+     
+   * mtools/Makefile, mtools/ToolsLinkDef.h:
+     - added MagicReversi
+   
+   * mtools/MagicRevers.[h,cc]:
+     - added
+
 
 
@@ -384 +464 @@
       - Added axis labels in graphic output
       - Added Get function for rate histograms
+
     * macros/trigrate.C
       - Added output file with rate histograms

trunk/MagicSoft/Mars/Makefile.conf.linux

@@ -20 +20 @@
 #  ----->>>   settings for compilation
 #
-OPTIM    = -O5 -Wall -fno-rtti -fnonnull-objects -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual
+OPTIM    = -O5 -Wall -fnonnull-objects -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual
 DEBUG    =
 ARCHDEF  = -D__LINUX__

trunk/MagicSoft/Mars/NEWS

@@ -40 +40 @@
    
    - added Random Forest - method for g/h-separation
+
+   - made compatible with the latest PRO version of root (3.04/02)
 
 

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -414 +414 @@
 }
 
+void MImgCleanStd::SetLvl1(Float_t lvl)
+{
+    fCleanLvl1 = lvl;
+    *fLog << inf << "Cleaning level 1 set to " << lvl << " sigma." << endl;
+}
+
+void MImgCleanStd::SetLvl2(Float_t lvl)
+{
+    fCleanLvl2 = lvl;
+    *fLog << inf << "Cleaning level 2 set to " << lvl << " sigma." << endl;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -433 +445 @@
     {
     case kImgCleanLvl1:
-        fCleanLvl1 = lvl;
-        *fLog << "Cleaning level 1 set to " << lvl << " sigma." << endl;
+        SetLvl1(lvl);
         return kTRUE;
 
     case kImgCleanLvl2:
-        fCleanLvl2 = lvl;
-        *fLog << "Cleaning level 2 set to " << lvl << " sigma." << endl;
+        SetLvl2(lvl);
         return kTRUE;
     }
@@ -465 +475 @@
     out << ");" << endl;
 }
+
+// --------------------------------------------------------------------------
+//
+// Read the setup from a TEnv:
+//   Float_t fCleanLvl1: CleaningLevel1
+//   Float_t fCleanLvl2: CleaningLevel2
+//
+Bool_t MImgCleanStd::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kTRUE;
+    if (!IsEnvDefined(env, prefix, "CleaningLevel1", print))
+        rc = kFALSE;
+    else
+    {
+        SetLvl1(GetEnvValue(env, prefix, "CleaningLevel1", fCleanLvl1));
+        if (fCleanLvl1<0)
+        {
+            *fLog << err << "ERROR - Negative values for Cleaning Level 1 forbidden." << endl;
+            return kERROR;
+        }
+    }
+
+    if (!IsEnvDefined(env, prefix, "CleaningLevel2", print))
+        rc = kFALSE;
+    else
+    {
+        SetLvl2(GetEnvValue(env, prefix, "CleaningLevel2", fCleanLvl2));
+        if (fCleanLvl2<0)
+        {
+            *fLog << err << "ERROR - Negative values for Cleaning Level 2 forbidden." << endl;
+            return kERROR;
+        }
+    }
+
+    return rc;
+}

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.h

@@ -20 +20 @@
     Float_t fCleanLvl2;
 
+    void SetLvl1(Float_t lvl);
+    void SetLvl2(Float_t lvl);
+
     void CreateGuiElements(MGGroupFrame *f);
     void StreamPrimitive(ofstream &out) const;
@@ -40 +43 @@
 
     Bool_t ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2);
+    Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
     ClassDef(MImgCleanStd, 0)    // task doing a standard image cleaning

trunk/MagicSoft/Mars/manalysis/MNewImagePar.cc

@@ -72 +72 @@
                           const MHillas *hillas)
 {
-    fHillas = hillas;
+    //fHillas = (MHillas*)hillas;
 
     const UInt_t npixevt = evt.GetNumPixels();
@@ -96 +96 @@
     }
 
-
-    fLeakage1 = edgepix1 / fHillas->GetSize();
-    fLeakage2 = edgepix2 / fHillas->GetSize();
+    fLeakage1 = edgepix1 / hillas->GetSize();
+    fLeakage2 = edgepix2 / hillas->GetSize();
 
     SetReadyToSave();

trunk/MagicSoft/Mars/manalysis/MNewImagePar.h

@@ -11 +11 @@
 {
 private:
-    const MHillas    *fHillas; //! Input parameters
-    const MSrcPosCam *fSrcPos; //! Source position in the camera
-
     Float_t fLeakage1;   // (photons in most outer ring of pixels) over fSize
     Float_t fLeakage2;   // (photons in the 2 outer rings of pixels) over fSize
@@ -20 +17 @@
     MNewImagePar(const char *name=NULL, const char *title=NULL);
 
-    void SetSrcPos(const MSrcPosCam *pos) { fSrcPos = pos; }
-    const MSrcPosCam *GetSrcPos() const   { return fSrcPos; }
+    //    void SetSrcPos(MSrcPosCam *pos) { fSrcPos = pos; }
+    //    const MSrcPosCam *GetSrcPos() const   { return fSrcPos; }
 
     void Reset();

trunk/MagicSoft/Mars/manalysis/MNewImageParCalc.cc

@@ -107 +107 @@
         return kFALSE;
 
-    fNewImagePar->SetSrcPos(fSrcPos);
-
     fErrors = 0;
 

trunk/MagicSoft/Mars/manalysis/MNewImageParCalc.h

@@ -15 +15 @@
 {
 private:
-    const MGeomCam    *fGeomCam;
-    const MCerPhotEvt *fCerPhotEvt;
+    MGeomCam    *fGeomCam;
+    MCerPhotEvt *fCerPhotEvt;
 
     MHillas      *fHillas;       //! Pointer to the source independent hillas parameters

trunk/MagicSoft/Mars/manalysis/MRanForest.cc

@@ -288 +288 @@
 
     // give running output
-    TString str=Form("%.2f",100.*fErr);
-    cout.width(5);  cout<<fTreeNo;
-    cout.width(15); cout<<str<<endl;
+    cout << setw(5) << fTreeNo << setw(15) << Form("%.2f",100.*fErr) << endl;
 
     // adding tree to forest

trunk/MagicSoft/Mars/manalysis/MSigmabar.cc

@@ -91 +91 @@
   Int_t outerPixels[6]       = {0,0,0,0,0,0};
 
-  Int_t currentSector;
-  Float_t angle;
-  
   // sum up sigma**2 for each sector, separately for inner and outer region;
   // all pixels are renormalized to the area of pixel 0
@@ -117 +114 @@
 
       Int_t j = cerpix.GetPixId();
-      Double_t Area = geom.GetPixRatio(j);
+      Double_t area = geom.GetPixRatio(j);
 
       const MGeomPix    &gpix = geom[j];
@@ -125 +122 @@
       //if (angle<0.0) angle+=6.0;
 
-      angle = 6.0*atan2(gpix.GetY(),gpix.GetX()) / (2.0*TMath::Pi());
-      if (angle<0.0) angle+=6.0;
-      currentSector=(Int_t)angle;
+      Float_t angle = atan2(gpix.GetY(),gpix.GetX())*6 / (TMath::Pi()*2);
+      if (angle<0) angle+=6;
+
+      Int_t currentSector=(Int_t)angle;
        
       // count only those pixels which have a sigma != 0.0 
@@ -134 +132 @@
       if ( sigma != 0.0 )
       {  
-        if (Area < 1.5)
+        if (area < 1.5)
         {
           innerPixels[currentSector]++;
-          innerSquaredSum[currentSector]+= sigma*sigma / Area;
+          innerSquaredSum[currentSector]+= sigma*sigma / area;
         }
         else
         {
           outerPixels[currentSector]++;
-          outerSquaredSum[currentSector]+= sigma*sigma / Area;
+          outerSquaredSum[currentSector]+= sigma*sigma / area;
         }
       }
@@ -191 +189 @@
   }
     
-  return (fSigmabar);
+  return fSigmabar;
 }
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -103 +103 @@
 // default constructor - emty
 //
-MEvtLoop::MEvtLoop() : fParList(NULL), fProgress(NULL)
-{
-    fName = "Evtloop";
+MEvtLoop::MEvtLoop(const char *name) : fParList(NULL), fProgress(NULL)
+{
+    fName = name;
 }
 
@@ -444 +444 @@
 // gui elements to a macro-file.
 //
-
 void MEvtLoop::StreamPrimitive(ofstream &out) const
 {
-    out << "   MEvtLoop " << GetUniqueName() << ";" << endl;
-}
-
+    out << "   MEvtLoop " << GetUniqueName();
+    if (fName!="Evtloop")
+        out << "(\"" << fName << "\")";
+    out << ";" << endl;
+}
+
+// --------------------------------------------------------------------------
+//
+//
 void MEvtLoop::SavePrimitive(ofstream &out, Option_t *opt)
 {
@@ -666 +671 @@
     return n;
 }
+
+// --------------------------------------------------------------------------
+//
+// Read the contents/setup of a parameter container/task from a TEnv
+// instance (steering card/setup file).
+// The key to search for in the file should be of the syntax:
+//    prefix.vname
+// While vname is a name which is specific for a single setup date
+// (variable) of this container and prefix is something like:
+//    evtloopname.name
+// While name is the name of the containers/tasks in the parlist/tasklist
+//
+// eg.  Job4.MImgCleanStd.CleaningLevel1:  3.0
+//      Job4.MImgCleanStd.CleaningLevel2:  2.5
+//
+// If this cannot be found the next step is to search for
+//      MImgCleanStd.CleaningLevel1:  3.0
+// And if this doesn't exist, too, we should search for:
+//      CleaningLevel1:  3.0
+//
+// Warning: The programmer is responsible for the names to be unique in
+//          all Mars classes.
+//
+Bool_t MEvtLoop::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    if (!prefix.IsNull())
+        *fLog << warn << "WARNING - Second argument in MEvtLoop::ReadEnv has no meaning... ignored." << endl;
+
+    *fLog << "1: " << "'" << prefix << "'" << (int)print << endl;
+
+    prefix = fName;
+    prefix += ".";
+
+    *fLog << inf << "Reading resources for " << prefix /*TEnv::fRcName << " from " << env.GetRcName()*/ << endl;
+
+    if (fParList->ReadEnv(env, prefix, print)==kERROR)
+    {
+        *fLog << err << "ERROR - Reading Environment file." << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Write the contents/setup of a parameter container/task to a TEnv
+// instance (steering card/setup file).
+// The key to search for in the file should be of the syntax:
+//    prefix.vname
+// While vname is a name which is specific for a single setup date
+// (variable) of this container and prefix is something like:
+//    evtloopname.name
+// While name is the name of the containers/tasks in the parlist/tasklist
+//
+// eg.  Job4.MImgCleanStd.CleaningLevel1:  3.0
+//      Job4.MImgCleanStd.CleaningLevel2:  2.5
+//
+// If this cannot be found the next step is to search for
+//      MImgCleanStd.CleaningLevel1:  3.0
+// And if this doesn't exist, too, we should search for:
+//      CleaningLevel1:  3.0
+//
+// Warning: The programmer is responsible for the names to be unique in
+//          all Mars classes.
+//
+Bool_t MEvtLoop::WriteEnv(TEnv &env, TString prefix, Bool_t print) const
+{
+    if (!prefix.IsNull())
+        *fLog << warn << "WARNING - Second argument in MEvtLoop::WriteEnv has no meaning... ignored." << endl;
+
+    prefix = fName;
+    prefix += ".";
+
+    *fLog << inf << "Writing resources: " << prefix /*TEnv::fRcName << " to " << env.GetRcName()*/ << endl;
+
+    if (fParList->WriteEnv(env, prefix, print)!=kTRUE)
+    {
+        *fLog << err << "ERROR - Writing Environment file." << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -37 +37 @@
 
 public:
-    MEvtLoop();
+    MEvtLoop(const char *name="Evtloop");
     virtual ~MEvtLoop();
 
@@ -66 +66 @@
     void Print(Option_t *opt="") const;
 
+    Bool_t ReadEnv(const TEnv &env, TString prefix="", Bool_t print=kFALSE);
+    Bool_t WriteEnv(TEnv &env, TString prefix="", Bool_t print=kFALSE) const;
+
     ClassDef(MEvtLoop, 1) // Class to execute the tasks in a tasklist
 };

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -40 +40 @@
 #include <fstream.h>     // ofstream, AsciiWrite
 
-#include <TROOT.h>       // TROOT::Identlevel
+#include <TEnv.h>        // Env::Lookup
 #include <TClass.h>      // IsA
 #include <TObjArray.h>   // TObjArray
@@ -54 +54 @@
 #include "MEvtLoop.h"    // gListOfPrimitives
 #else
-TList *gListOfPrimitives;
+TList *gListOfPrimitives; // forard declaration in MParContainer.h
 #endif
 
@@ -122 +122 @@
 //
 void MParContainer::Copy(TObject &obj)
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
+const
+#endif
 {
     MParContainer &cont = (MParContainer&)obj;
@@ -449 +452 @@
     return (MParContainer*)IsA()->New();
 }
+
+// --------------------------------------------------------------------------
+//
+// Read the contents/setup of a parameter container/task from a TEnv
+// instance (steering card/setup file).
+// The key to search for in the file should be of the syntax:
+//    prefix.vname
+// While vname is a name which is specific for a single setup date
+// (variable) of this container and prefix is something like:
+//    evtloopname.name
+// While name is the name of the containers/tasks in the parlist/tasklist
+//
+// eg.  Job4.MImgCleanStd.CleaningLevel1:  3.0
+//      Job4.MImgCleanStd.CleaningLevel2:  2.5
+//
+// If this cannot be found the next step is to search for
+//      MImgCleanStd.CleaningLevel1:  3.0
+// And if this doesn't exist, too, we should search for:
+//      CleaningLevel1:  3.0
+//
+// Warning: The programmer is responsible for the names to be unique in
+//          all Mars classes.
+//
+Bool_t MParContainer::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    if (!IsEnvDefined(env, prefix, "", print))
+        return kFALSE;
+
+    *fLog << warn << "WARNING - Resource " << prefix+fName << " found, but no " << IsA()->GetName() << "::ReadEnv." << endl;
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Write the contents/setup of a parameter container/task to a TEnv
+// instance (steering card/setup file).
+// The key to search for in the file should be of the syntax:
+//    prefix.vname
+// While vname is a name which is specific for a single setup date
+// (variable) of this container and prefix is something like:
+//    evtloopname.name
+// While name is the name of the containers/tasks in the parlist/tasklist
+//
+// eg.  Job4.MImgCleanStd.CleaningLevel1:  3.0
+//      Job4.MImgCleanStd.CleaningLevel2:  2.5
+//
+// If this cannot be found the next step is to search for
+//      MImgCleanStd.CleaningLevel1:  3.0
+// And if this doesn't exist, too, we should search for:
+//      CleaningLevel1:  3.0
+//
+// Warning: The programmer is responsible for the names to be unique in
+//          all Mars classes.
+//
+Bool_t MParContainer::WriteEnv(TEnv &env, TString prefix, Bool_t print) const
+{
+    if (!IsEnvDefined(env, prefix, "", print))
+        return kFALSE;
+
+    *fLog << warn << "WARNING - Resource " << prefix+fName << " found, but " << IsA()->GetName() << "::WriteEnv not overloaded." << endl;
+    return kTRUE;
+}
+
+Bool_t MParContainer::IsEnvDefined(const TEnv &env, TString prefix, TString postfix, Bool_t print) const
+{
+    if (!postfix.IsNull())
+        postfix.Insert(0, ".");
+
+    return IsEnvDefined(env, prefix+fName+postfix, print);
+}
+
+Bool_t MParContainer::IsEnvDefined(const TEnv &env, TString name, Bool_t print) const
+{
+    if (print)
+        *fLog << all << GetDescriptor() << " - " << name << "... " << flush;
+
+    if (!((TEnv&)env).Defined(name))
+    {
+        if (print)
+            *fLog << "not found." << endl;
+        return kFALSE;
+    }
+
+    if (print)
+        *fLog << "found." << endl;
+
+    return kTRUE;
+}
+
+Int_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, TString postfix, Int_t dflt) const
+{
+    return ((TEnv&)env).GetValue(prefix+fName+"."+postfix, dflt);
+}
+
+Double_t MParContainer::GetEnvValue(const TEnv &env, TString prefix, TString postfix, Double_t dflt) const
+{
+    return ((TEnv&)env).GetValue(prefix+fName+"."+postfix, dflt);
+}
+
+const char *MParContainer::GetEnvValue(const TEnv &env, TString prefix, TString postfix, const char *dflt) const
+{
+    return ((TEnv&)env).GetValue(prefix+fName+"."+postfix, dflt);
+}

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -23 +23 @@
 class ifstream;
 
+class TEnv;
 class TDataMember;
 class TMethodCall;
@@ -56 +57 @@
     virtual TObject    *Clone(const char *newname="") const;
     virtual Int_t       Compare(const TObject *obj) const;
-    virtual void        Copy(TObject &named);
+    virtual void        Copy(TObject &named)
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
+const
+#endif
+        ;
     virtual void        FillBuffer(char *&buffer);
 
@@ -95 +100 @@
     virtual void SetNames(TObjArray &arr);
 
+    virtual Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+    virtual Bool_t WriteEnv(TEnv &env, TString prefix, Bool_t print=kFALSE) const;
+
+    Bool_t ReadEnv(const TEnv &env, Bool_t print=kFALSE) { return ReadEnv(env, "", print); }
+    Bool_t WriteEnv(TEnv &env, Bool_t print=kFALSE) const { return WriteEnv(env, "", print); }
+
+    Bool_t IsEnvDefined(const TEnv &env, TString prefix, TString postfix, Bool_t print) const;
+    Bool_t IsEnvDefined(const TEnv &env, TString name, Bool_t print) const;
+
+    Int_t       GetEnvValue(const TEnv &env, TString prefix, TString postfix, Int_t dflt) const;
+    Double_t    GetEnvValue(const TEnv &env, TString prefix, TString postfix, Double_t dflt) const;
+    const char *GetEnvValue(const TEnv &env, TString prefix, TString postfix, const char *dflt) const;
+
     ClassDef(MParContainer, 0)  //The basis for all parameter containers
 };

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -768 +768 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Read the contents/setup of a parameter container/task from a TEnv
+// instance (steering card/setup file).
+// The key to search for in the file should be of the syntax:
+//    prefix.vname
+// While vname is a name which is specific for a single setup date
+// (variable) of this container and prefix is something like:
+//    evtloopname.name
+// While name is the name of the containers/tasks in the parlist/tasklist
+//
+// eg.  Job4.MImgCleanStd.CleaningLevel1:  3.0
+//      Job4.MImgCleanStd.CleaningLevel2:  2.5
+//
+// If this cannot be found the next step is to search for
+//      MImgCleanStd.CleaningLevel1:  3.0
+// And if this doesn't exist, too, we search for:
+//      CleaningLevel1:  3.0
+//
+// Warning: The programmer is responsible for the names to be unique in
+//          all Mars classes.
+//
+Bool_t MParList::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    MParContainer *cont = NULL;
+
+    TIter Next(fContainer);
+    while ((cont=(MParContainer*)Next()))
+        if (cont->ReadEnv(env, print)==kERROR)
+            return kERROR;
+
+    Next.Reset();
+    while ((cont=(MParContainer*)Next()))
+        if (cont->ReadEnv(env, prefix, print)==kERROR)
+            return kERROR;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Write the contents/setup of a parameter container/task to a TEnv
+// instance (steering card/setup file).
+// The key to search for in the file should be of the syntax:
+//    prefix.vname
+// While vname is a name which is specific for a single setup date
+// (variable) of this container and prefix is something like:
+//    evtloopname.name
+// While name is the name of the containers/tasks in the parlist/tasklist
+//
+// eg.  Job4.MImgCleanStd.CleaningLevel1:  3.0
+//      Job4.MImgCleanStd.CleaningLevel2:  2.5
+//
+// If this cannot be found the next step is to search for
+//      MImgCleanStd.CleaningLevel1:  3.0
+// And if this doesn't exist, too, we search for:
+//      CleaningLevel1:  3.0
+//
+// Warning: The programmer is responsible for the names to be unique in
+//          all Mars classes.
+//
+Bool_t MParList::WriteEnv(TEnv &env, TString prefix, Bool_t print) const
+{
+    MParContainer *cont = NULL;
+
+    TIter Next(fContainer);
+    while ((cont=(MParContainer*)Next()))
+        if (!cont->WriteEnv(env, prefix, print))
+            return kFALSE;
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -90 +90 @@
     void SavePrimitive(ofstream &out, Option_t *o="");
 
+    Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+    Bool_t WriteEnv(TEnv &env, TString prefix, Bool_t print=kFALSE) const;
+
     ClassDef(MParList, 1) // list of parameter containers (MParContainer)
 };

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -643 +643 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Read the contents/setup of a parameter container/task from a TEnv
+// instance (steering card/setup file).
+// The key to search for in the file should be of the syntax:
+//    prefix.vname
+// While vname is a name which is specific for a single setup date
+// (variable) of this container and prefix is something like:
+//    evtloopname.name
+// While name is the name of the containers/tasks in the parlist/tasklist
+//
+// eg.  Job4.MImgCleanStd.CleaningLevel1:  3.0
+//      Job4.MImgCleanStd.CleaningLevel2:  2.5
+//
+// If this cannot be found the next step is to search for
+//      MImgCleanStd.CleaningLevel1:  3.0
+// And if this doesn't exist, too, we should search for:
+//      CleaningLevel1:  3.0
+//
+// Warning: The programmer is responsible for the names to be unique in
+//          all Mars classes.
+//
+Bool_t MTaskList::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    MParContainer *cont = NULL;
+
+    TIter Next(fTasks);
+    while ((cont=(MParContainer*)Next()))
+        if (cont->ReadEnv(env, print)==kERROR)
+            return kERROR;
+
+    Next.Reset();
+    while ((cont=(MParContainer*)Next()))
+        if (cont->ReadEnv(env, prefix, print)==kERROR)
+            return kERROR;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Write the contents/setup of a parameter container/task to a TEnv
+// instance (steering card/setup file).
+// The key to search for in the file should be of the syntax:
+//    prefix.vname
+// While vname is a name which is specific for a single setup date
+// (variable) of this container and prefix is something like:
+//    evtloopname.name
+// While name is the name of the containers/tasks in the parlist/tasklist
+//
+// eg.  Job4.MImgCleanStd.CleaningLevel1:  3.0
+//      Job4.MImgCleanStd.CleaningLevel2:  2.5
+//
+// If this cannot be found the next step is to search for
+//      MImgCleanStd.CleaningLevel1:  3.0
+// And if this doesn't exist, too, we should search for:
+//      CleaningLevel1:  3.0
+//
+// Warning: The programmer is responsible for the names to be unique in
+//          all Mars classes.
+//
+Bool_t MTaskList::WriteEnv(TEnv &env, TString prefix, Bool_t print) const
+{
+    MParContainer *cont = NULL;
+
+    TIter Next(fTasks);
+    while ((cont=(MParContainer*)Next()))
+        if (!cont->WriteEnv(env, prefix, print))
+            return kFALSE;
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -67 +67 @@
     void SetNames(TObjArray &arr);
 
+    Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+    Bool_t WriteEnv(TEnv &env, TString prefix, Bool_t print=kFALSE) const;
+
     ClassDef(MTaskList, 1) //collection of tasks to be performed in the eventloop
 };

trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc

@@ -96 +96 @@
 // Add this file as the last entry in the chain
 //
-void MCT1ReadAscii::AddFile(const char *txt)
+Int_t MCT1ReadAscii::AddFile(const char *txt, Int_t)
 {
     TNamed *name = new TNamed(txt, "");
     fFileNames->AddLast(name);
+    return 1;
 }
 
@@ -299 +300 @@
     return kTRUE;
 }
-

trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.h

@@ -30 +30 @@
     ~MCT1ReadAscii();
 
-    void AddFile(const char *fname);
+    Int_t AddFile(const char *fname, Int_t dummy=-1);
 
     Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -119 +119 @@
 // Add this file as the last entry in the chain
 //
-void MCT1ReadPreProc::AddFile(const char *txt)
+Int_t MCT1ReadPreProc::AddFile(const char *txt, Int_t)
 {
     const char *name = gSystem->ExpandPathName(txt);
@@ -129 +129 @@
     {
         *fLog << warn << "WARNING - Problem reading header... ignored." << endl;
-        return;
+        return 0;
     }
 
@@ -136 +136 @@
     {
         *fLog << warn << "WARNING - File contains no data... ignored." << endl;
-        return;
+        return 0;
     }
 
@@ -144 +144 @@
 
     fFileNames->AddLast(new TNamed(txt, ""));
+    return 1;
 }
 

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -77 +77 @@
     ~MCT1ReadPreProc();
 
-    void AddFile(const char *fname);
+    Int_t AddFile(const char *fname, Int_t dummy=-1);
 
     UInt_t GetEntries() { return fEntries; }

trunk/MagicSoft/Mars/mfileio/MRead.cc

@@ -39 +39 @@
 ClassImp(MRead);
 
+// --------------------------------------------------------------------------
+//
+// Read the setup from a TEnv:
+//   File0, File1, File2, ..., File10, ..., File100, ...
+//
+// Searching stops if the first key isn't found in the TEnv
+//
+// Enclosing quotation marks (") are removed
+//
+// Number of entries at the moment not supported
+//
+Bool_t MRead::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    //
+    // Don't allow 'global' setup of files
+    //
+    if (prefix.IsNull())
+        return kFALSE;
+
+    //
+    // Search (beginning with 0) all keys
+    //
+    for (int i=0;; i++)
+    {
+        TString idx = "File";
+        idx += i;
+
+        // Output if print set to kTRUE
+        IsEnvDefined(env, prefix, idx, print);
+
+        // Try to get the file name
+        TString name = GetEnvValue(env, prefix, idx, "");
+        if (name.IsNull())
+            return kTRUE;
+
+        if (name.BeginsWith("\"") && name.EndsWith("\""))
+        {
+            name.Remove(name.Last('\"'), 1);
+            name.Remove(name.First('\"'), 1);
+        }
+
+        AddFile(name);
+    }
+
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mfileio/MRead.h

@@ -21 +21 @@
     MFilter *GetSelector() { return fSelector; }
 
+    Int_t AddFile(const char *fname, Int_t entries=-1) { return -1; }
+
+    Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+
     ClassDef(MRead, 0)  // Base class for a reading task
 };

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -92 +92 @@
 //
 void MHexagon::Copy(TObject &obj)
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
+const
+#endif
+
 {
     MHexagon &hex = (MHexagon&) obj;

trunk/MagicSoft/Mars/mgui/MHexagon.h

@@ -44 +44 @@
     virtual ~MHexagon();
 
-    virtual void  Copy(TObject &hexagon);
+    virtual void  Copy(TObject &hexagon)
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
+const
+#endif
+        ;
 
     virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -59 +59 @@
 #include <TLegend.h>
 #include <TPaveStats.h>
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
+#include <THLimitsFinder.h>
+#endif
 
 #include "MLog.h"
@@ -469 +472 @@
 void MH::FindGoodLimits(Int_t nbins, Int_t &newbins, Double_t &xmin, Double_t &xmax, Bool_t isInteger)
 {
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
+    THLimitsFinder::OptimizeLimits(nbins, newbins, xmin, xmax, isInteger);
+#else
 //*-*-*-*-*-*-*-*-*Find reasonable bin values*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
 //*-*              ==========================
@@ -486 +492 @@
     Double_t binwidth=0;
 
-#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,01)
     TGaxis::Optimize(umin, umax, nbins, binlow, binhigh, nbins, binwidth, "");
-#else
-    gLog << all << "*********************************************************" << endl;
-    gLog << all << "ERROR, because Abelardo removed TGaxis::Optimize from" << endl;
-    gLog << all << " MH::FindGoodLimits to be able to compile Mars with newer" << endl;
-    gLog << all << " root versions, whatever you are trying to do will fail!!!" << endl;
-    gLog << all << "*********************************************************" << endl;
-#endif
 
     if (binwidth <= 0 || binwidth > 1.e+39)
@@ -532 +530 @@
 
     newbins = nbins;
+#endif
 }
 

trunk/MagicSoft/Mars/mhist/MHRanForest.cc

@@ -114 +114 @@
 
     Int_t ntrees=fRanForest->GetNumTrees();
-    //cout<<"filling"<<endl;
+
     for (Int_t i=0;i<ntrees;i++)
     {
@@ -120 +120 @@
             hest+=fRanForest->GetTreeHad(j);
 
-        hest/=Double_t(i+1);
+        hest/=i+1;
         fSigma[i]+=(htrue-hest)*(htrue-hest);
     }
@@ -177 +177 @@
         g.GetXaxis()->SetTitle("Number of Trees");
         g.GetYaxis()->SetTitle("Standard deviation of estimated hadronness");
-        g.SetMarkerStyle(kFullDotlarge);
-        g.Draw("P");
-
+        g.SetMarkerStyle(kFullDotMedium);
+        gPad->Modified();
+        gPad->Update();
+        //g.Draw("P");
     }
     gPad->SetGrid();
@@ -209 +210 @@
 
         fGraphSigma->SetMarkerStyle(kFullDotSmall);
-        fGraphSigma->Draw("P");
+        //fGraphSigma->Draw("P");
         gPad->Modified();
         gPad->Update();

trunk/MagicSoft/Mars/mhist/MHRanForestGini.cc

@@ -121 +121 @@
     for (Int_t i=0; i<n; i++)
     {
+        fGini[i]/=fRanForest->GetNumTrees();
+        fGini[i]/=fRanForest->GetNumData();
+
         Stat_t ip = i+1.;
-        fGini[i]/=Stat_t(fRanForest->GetNumTrees());
-        fGini[i]/=Stat_t(fRanForest->GetNumData());
         Stat_t ig = fGini[i];
+
         max=TMath::Max(max,ig);
         min=TMath::Min(min,ig);
+
         fGraphGini->SetPoint(i,ip,ig);
     }
@@ -157 +160 @@
         g.GetXaxis()->SetTitle("No. of RF-input parameter");
         g.GetYaxis()->SetTitle("Mean decrease in Gini-index [a.u.]");
-        g.SetMarkerStyle(kFullDotlarge);
-        g.Draw("P");
-
+        g.SetMarkerStyle(kFullDotMedium);
+        //g.Draw("P");
+        gPad->Modified();
+        gPad->Update();
     }
     gPad->SetGrid();
@@ -189 +193 @@
 
         fGraphGini->SetMarkerStyle(kFullDotSmall);
-        fGraphGini->Draw("P");
+        //fGraphGini->Draw("P");
         gPad->Modified();
         gPad->Update();

trunk/MagicSoft/Mars/mhist/MHRanForestGini.h

@@ -19 +19 @@
 {
 private:
-    MRanForest *fRanForest;
+    MRanForest *fRanForest;  //!
 
-    TArrayF fGini;
-    TGraph *fGraphGini;
+    TArrayF fGini;           //!
+    TGraph *fGraphGini;      //->
 
 public:

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !   Author(s): Harald Kornmayer 1/2001
 !
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !   Modified 4/7/2002 Abelardo Moralejo: now the dimension of fTrigger is
@@ -27 +27 @@
 !
 \* ======================================================================== */
-
 #include "MMcTriggerRateCalc.h"
 
@@ -105 +104 @@
     if (fMcRunHeader->GetAllEvtsTriggered())
       {
-        *fLog << endl << all << endl <<
-          "WARNING: the input data file contains only the" << endl << 
-          "events that triggered. I will assume the standard value" << endl <<
-          "for maximum impact parameter (400 m)" <<endl;
-
-
-        if (fTrigNSB[0] > 0)
-          *fLog << endl << all <<
-            "WARNING: NSB rate can be overestimated by up to 5%." << endl <<
-            "For a precise estimate of the total rate including NSB" << endl << 
-            "accidental triggers I need a file containing all event headers." 
-                << endl;
-        else 
-          *fLog << endl << all <<
-            "WARNING: calculating only shower rate (no NSB accidental triggers)" << endl;
+          *fLog << warn;
+          *fLog << "WARNING - the input data file contains only the" << endl;
+          *fLog << "events that triggered. I will assume the standard value" << endl;
+          *fLog << "for maximum impact parameter (400 m)" <<endl;
+
+
+          if (fTrigNSB[0] > 0)
+          {
+              *fLog << warn;
+              *fLog << "WARNING - NSB rate can be overestimated by up to 5%." << endl;
+              *fLog << "For a precise estimate of the total rate including NSB" << endl;
+              *fLog << "accidental triggers I need a file containing all event headers." << endl;
+          }
+          else
+          {
+            *fLog << warn << "WARNING - calculating only shower rate (no NSB accidental triggers)" << endl;
+          }
       }
 
-    *fLog << endl << all <<
+    *fLog << endl << warn <<
       "WARNING: I will assume the standard maximum off axis angle" << endl <<
       "(5 degrees) for the original showers" << endl;
@@ -168 +169 @@
 //      rate:    rate of incident showers
 //
-
 MMcTriggerRateCalc::MMcTriggerRateCalc(float rate, int dim,
                                        float *trigbg, float simbg,
@@ -325 +325 @@
           if (fMcCorRunHeader->GetSlopeSpec() != -2.75)
             {
-              *fLog << err << dbginf <<
-                "Spectrum slope as read from  input file ("<< 
-                fMcCorRunHeader->GetSlopeSpec() << ") does not match the expected one (-2.75) for protons" << endl << "... aborting." << endl;
-              return kFALSE;
-            }
+                *fLog << err << dbginf << "Spectrum slope as read from input file (";
+                *fLog << fMcCorRunHeader->GetSlopeSpec() << ") does not match the expected ";
+                *fLog << "one (-2.75) for protons" << endl << "... aborting." << endl;
+                return kFALSE;
+            }
           rate.SetFlux(0.1091, 2.75);
           break;
@@ -335 +335 @@
           if (fMcCorRunHeader->GetSlopeSpec() != -2.62)
             {
-              *fLog << err << dbginf <<
-                "Spectrum slope as read from  input file ("<< 
-                fMcCorRunHeader->GetSlopeSpec() << ") does not match the expected one (-2.75) for Helium" << endl << "... aborting." << endl;
-              return kFALSE;
+                *fLog << err << dbginf << "Spectrum slope as read from input file (";
+                *fLog << fMcCorRunHeader->GetSlopeSpec() << ") does not match the expected ";
+                *fLog << "one (-2.75) for Helium" << endl << "... aborting." << endl;
+                return kFALSE;
             }
           rate.SetFlux(0.0660, 2.62);
@@ -363 +363 @@
 void MMcTriggerRateCalc::Draw()
 {
+    /*
+     Commented out, because this is creating a memory leak!
+     The histograms are neither deleted anywhere, nor it is made
+     sure, that the histograms are not overwritten.
+     Also the comment for the function doesn't match the rules.
+
   TCanvas *c = MH::MakeDefCanvas("Rate");
 
   Float_t xmin = GetRate(0)->GetMeanThreshold()-0.55;
   Float_t xmax = GetRate(fNum-1)->GetMeanThreshold()+0.55;
-  Int_t  nbins = 10*(xmax-xmin);
+  Int_t  nbins = (Int_t)((xmax-xmin)*10);
 
   fHist[1] = new TH1F("Rate2","Trigger rate, mult. 2", nbins, xmin, xmax);
@@ -412 +418 @@
   fHist[4]->Draw("same");
   fHist[4]->SetMarkerColor(4);
-
-  return;
-}
-
+     */
+}
+

trunk/MagicSoft/Mars/mtools/Makefile

@@ -29 +29 @@
 
 SRCFILES = MChisqEval.cc \
+           MagicReversi.cc \
            MagicSnake.cc \
            MagicShow.cc \

trunk/MagicSoft/Mars/mtools/ToolsLinkDef.h

@@ -7 +7 @@
 #pragma link C++ class MChisqEval+;
 #pragma link C++ class MineSweeper+;
-// #pragma link C++ class MagicReversi+;
+#pragma link C++ class MagicReversi+;
 #pragma link C++ class MagicSnake+;
 #pragma link C++ class MagicShow+;