Changeset 9345 for trunk

Timestamp:

02/16/09 10:19:21 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• callisto.cc (modified) (1 diff)
• ceres.cc (modified) (1 diff)
• ganymed.cc (modified) (1 diff)
• mbase/MEnv.cc (modified) (7 diffs)
• mbase/MEnv.h (modified) (5 diffs)
• mbase/MParList.cc (modified) (2 diffs)
• mjobs/MJSpectrum.cc (modified) (3 diffs)
• mjobs/MJob.cc (modified) (1 diff)
• sponde.cc (modified) (1 diff)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2009/02/16 Thomas Bretz
+
+   * mimage/MHHillas.cc, mimage/MHHillasExt.cc, mimage/MHHillasSrc.cc,
+     mimage/MHImagePar.cc:
+     - replaced green by blue for better readability on projectors
+
+   * mbase/MEnv.[h,cc]:
+     - added the option of a default name to allow i/o more similar
+       to MParContainer
+     - improved Print()
+
+   * ceres.cc, callisto.cc, star.cc, ganymed.cc, sponde.cc:
+     - make use of the new default name of MEnv
+
+   * mjobs/MJSpectrum.cc:
+     - read and write ganymed.rc
+
+   * mbase/MParList.cc:
+     - if adding a TObjArray add only MParContainers (for sanity)
+
+   * mjobs/MJob.cc:
+     - when reading read also TObjects
+
+   * mjobs/MJSpectrum.cc:
+     - now read the ganymed.rc and write it to the output
+
+
+
  2009/02/15 Thomas Bretz
 

trunk/MagicSoft/Mars/NEWS

@@ -84 +84 @@
      eff. on-time from the fit in the new tab, e.g. when a zenith distance
      cut was made in ganymed. This can now be forced by ''--force-ontimefit''
+
+   * now reads the ''ganymed.rc'' from the ''ganymed.root'' and writes
+     it to its own output file (for convinience)
 
 

trunk/MagicSoft/Mars/callisto.cc

@@ -216 +216 @@
     // --rc= from the list of arguments.
     //
-    MEnv env(kConfig);
+    MEnv env(kConfig, "callisto.rc");
     if (!env.IsValid())
     {

trunk/MagicSoft/Mars/ceres.cc

@@ -137 +137 @@
     // --rc= from the list of arguments.
     //
-    MEnv env(kConfig);
+    MEnv env(kConfig, "ceres.rc");
     if (!env.IsValid())
     {

trunk/MagicSoft/Mars/ganymed.cc

@@ -185 +185 @@
     // --rc= from the list of arguments.
     //
-    MEnv env(kConfig);
+    MEnv env(kConfig, "ganymed.rc");
     if (!env.IsValid())
     {

trunk/MagicSoft/Mars/mbase/MEnv.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz  2/2005 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2007
+!   Copyright: MAGIC Software Development, 2000-2009
 !
 !
@@ -44 +44 @@
 // the including file.
 //
+// Class Version 1:
+// ----------------
+//  + TString fName
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MEnv.h"
@@ -71 +75 @@
 // is called which can then be checked by IsValid()
 //
-MEnv::MEnv(const char *name) : TEnv(name)
+// The second argument is the default name. Usually as name of the MEnv
+// the base name of the file is returned. By giving a default name
+// you can overwrite this behavious. This is useful for I/O
+// because it allows to use Read and Write without argument.
+//
+MEnv::MEnv(const char *name, const char *defname) : TEnv(name), fName(defname)
 {
     fChecked.SetOwner();
@@ -174 +183 @@
     inc = inc.Strip(TString::kBoth);
 
-    // Set final resource, now as kEnvLocal (previously set as kEnvChnaged)
+    // Set final resource, now as kEnvLocal (previously set as kEnvChanged)
     SetValue("Include", inc, kEnvLocal);
 
@@ -198 +207 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Read an object from the current directory. If no name is given
+// the name of this object is used. 
+//
+Int_t MEnv::Read(const char *name)
+{
+    const Int_t rc = TEnv::Read(name?name:(const char*)fName);
+    //if (name)
+    //    SetName(name);
+    return rc;
+}
+
 //---------------------------------------------------------------------------
 //
@@ -204 +226 @@
 const char *MEnv::GetName() const
 {
+    if (!fName.IsNull())
+        return fName;
+
     const char *pos = strrchr(GetRcName(), '/');
     return pos>0 ? pos+1 : GetRcName();
@@ -1061 +1086 @@
 void MEnv::PrintEnv(EEnvLevel level) const
 {
-    cout << "# Path: " << GetRcName() << endl;
-    cout << "# Name: " << GetName() << endl;
+    if (!TString(GetRcName()).IsNull())
+    {
+        cout << "# Path: " << GetRcName() << endl;
+        cout << "# File: " << gSystem->BaseName(GetRcName()) << endl;
+    }
+    if (!fName.IsNull())
+        cout << "# Name: " << fName << endl;
+
     TEnv::PrintEnv(level);
 }

trunk/MagicSoft/Mars/mbase/MEnv.h

@@ -21 +21 @@
 {
 private:
-    TOrdCollection fChecked;
+    TOrdCollection fChecked; //!
+
+    TString fName;
 
     TString Compile(TString str, const char *post) const;
@@ -27 +29 @@
 
 public:
-    MEnv(const char *name="");
+    MEnv(const char *name="", const char *defname=0);
 
     Bool_t      IsValid() const { return !TString(GetRcName()).IsNull(); }
@@ -44 +46 @@
 
     const char *GetName() const;
+    void        SetName(const char *name=0) { fName = name; }
 
     Int_t       GetColor(const char *name, Int_t dftl);
@@ -73 +76 @@
     Bool_t      TakeEnv(MArgs &args, Bool_t print=kFALSE, Bool_t overwrite=kTRUE);
 
+    Int_t       Read(const char *name=0);
     Int_t       ReadFile(const char *fname, EEnvLevel level);
 
@@ -85 +89 @@
     Int_t GetNumUntouched() const;
 
-    ClassDef(MEnv, 0) // A slightly more advanced version of TEnv
+    ClassDef(MEnv, 1) // A slightly more advanced version of TEnv
 };
     

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -245 +245 @@
 // --------------------------------------------------------------------------
 //
-//  Add all entries of the TObjArray to the list.
+// Add all entries which derive from MParContainer
+// of the TObjArray to the list.
 //
 void MParList::AddToList(TObjArray *list)
@@ -255 +256 @@
         return;
 
-    MIter Next(list);
-
-    MParContainer *cont = NULL;
+    TIter Next(list);
+
+    TObject *cont = NULL;
     while ((cont=Next()))
     {
+        if (!dynamic_cast<MParContainer*>(cont))
+            continue;
+
         cont->SetBit(kMustCleanup);
         AddToList(cont);

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -58 +58 @@
 #include "MH3.h"
 #include "MHn.h"
+#include "MEnv.h"
 #include "MBinning.h"
 #include "MParameters.h"
@@ -1539 +1540 @@
     MBinning binsa("BinningAsym");
     MBinning binsb("BinningConc1");
+
+    MEnv env("", "ganymed.rc");
 
     MAlphaFitter fit;
@@ -1963 +1966 @@
         // Write the output
         TObjArray cont;
-        cont.Add((TObject*)GetEnv()); // const_cast
-        cont.Add((TObject*)&set);     // const_cast
+        cont.Add(&env);                           // ganymed.rc
+        cont.Add(const_cast<TEnv*>(GetEnv()));    // sponde.rc
+        cont.Add(const_cast<MDataSet*>(&set));    // Dataset
         cont.Add(plist.FindObject("MAlphaFitter"));
         cont.Add(&area0);

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -460 +460 @@
     }
 
-    MIter Next(&list);
-    MParContainer *o=0;
+    TIter Next(&list);
+    TObject *o=0;
     while ((o=Next()))
     {
-        *fLog << inf << " - Reading " << o->GetDescriptor() << "..." << flush;
+        *fLog << inf << " - Reading " << MParContainer::GetDescriptor(*o) << "..." << flush;
         if (o->Read(o->GetName())<=0)
         {
-            *fLog << err << dbginf << "ERROR - Reading " << o->GetDescriptor() << " from file " << gFile->GetName() << endl;
+            *fLog << err << dbginf << "ERROR - Reading " << MParContainer::GetDescriptor(*o) << " from file " << gFile->GetName() << endl;
             return kFALSE;
         }

trunk/MagicSoft/Mars/sponde.cc

@@ -151 +151 @@
     // --rc= from the list of arguments.
     //
-    MEnv env(kConfig);
+    MEnv env(kConfig, "sponde.rc");
     if (!env.IsValid())
     {

trunk/MagicSoft/Mars/star.cc

@@ -149 +149 @@
     // --rc= from the list of arguments.
     //
-    MEnv env(kConfig);
+    MEnv env(kConfig, "star.rc");
     if (!env.IsValid())
     {