Changeset 1487 for trunk/MagicSoft

Timestamp:

08/07/02 14:32:26 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/dohtml.C (modified) (2 diffs)
• manalysis/MBlindPixelCalc.cc (modified) (8 diffs)
• manalysis/MBlindPixelCalc.h (modified) (2 diffs)
• manalysis/MHillasSrcCalc.cc (modified) (4 diffs)
• manalysis/MHillasSrcCalc.h (modified) (1 diff)
• manalysis/MImgCleanStd.cc (modified) (3 diffs)
• manalysis/MSrcPosCam.cc (modified) (3 diffs)
• mbase/MEvtLoop.cc (modified) (6 diffs)
• mbase/MEvtLoop.h (modified) (1 diff)
• mbase/MFilterList.cc (deleted)
• mbase/MFilterList.h (deleted)
• mbase/MParContainer.cc (modified) (2 diffs)
• mbase/MParList.cc (modified) (1 diff)
• mbase/MTaskList.cc (modified) (1 diff)
• mhist/MBinning.cc (modified) (1 diff)
• mhist/MHHillas.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/08/07: Thomas Bretz
+
+   * macros/dohtml.C:
+     - added missing paths
+
+   * manalysis/MBlindPixelCalc.[h,cc]:
+     - replaced booleans by fFlags
+     - added StreamPrimitive
+     - changed version number to 1
+
+   * manalysis/MHillasSrcCalc.[h,cc]:
+     - added correct initializations for the pointers
+     - made the pointers persistent
+
+   * manalysis/MImgCleanStd.cc, manalysis/MSrcPosCam.cc,
+     mfileio/MWriteRootFile.cc:
+     - don't stream name and title if not necessary
+
+   * mbase/MEvtLoop.[h,cc]:
+     - added some output
+     - added print function
+     - added gListOfPrimitives to delete BIT(15) of streamed containers
+     - Added default argument for Read and Write
+
+   * mbase/MParContainer.cc:
+     - added usage of gListOfPrimitives
+
+   * mbase/MParList.cc, mbase/MTaskList.cc, mhist/MBinning.cc:
+     - fixed a bug when only the title is different from the default
+
+   * mhist/MHHillas.cc:
+     - fixed the wrong usage of ApplyBinning for the 2D-Hist fCenter
+
+
 
  2002/08/06: Thomas Bretz

trunk/MagicSoft/Mars/macros/dohtml.C

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Copyright: MAGIC Software Development, 2000-2002
 !
 !
@@ -36 +36 @@
 
     html.SetOutputDir("htmldoc");
-    html.SetSourceDir(".:mbase:mraw:mgui:manalysis:mdatacheck:mmain:meventdisp:mmc:mmontecarlo:mhist:mfilter");
+    html.SetSourceDir(".:mbase:mdata:mdatacheck:meventdisp:mfileio:mfilter:mgeom:mgui:mhist:mmain:mmc:mmontecarlo:mraw:mtools");
 
     html.MakeAll(kTRUE);

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc

@@ -53 +53 @@
 #include "MBlindPixelCalc.h"
 
+#include <fstream.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -68 +70 @@
 ClassImp(MBlindPixelCalc);
 
+static const TString gsDefName  = "MBlindPixelCalc";
+static const TString gsDefTitle = "Task to deal with hot spots (star, broken pixels, etc)";
+
 // --------------------------------------------------------------------------
 //
@@ -73 +78 @@
 //
 MBlindPixelCalc::MBlindPixelCalc(const char *name, const char *title)
-    : fUseInterpolation(kFALSE), fUseCentralPixel(kFALSE)
-{
-    fName  = name  ? name  : "MBlindPixelCalc";
-    fTitle = title ? title : "Task which removes a list of pixel from analysis";
+    : fFlags(0)
+{
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 }
 
@@ -129 +134 @@
 //
 //  Replaces each pixel by the average of its surrounding pixels.
-//  If fUseCentralPixel is set the central pixel is also included.
+//  If TESTBIT(fFlags, kUseCentralPixel) is set the central pixel is also included.
 //
 void MBlindPixelCalc::Interpolate() const
@@ -155 +160 @@
         const Int_t n = gpix.GetNumNeighbors();
 
-        nphot[i] = fUseCentralPixel ? (*fEvt)[id].GetNumPhotons() : 0;
-        perr[i]  = fUseCentralPixel ? (*fEvt)[id].GetErrorPhot()  : 0;
+        nphot[i] = TESTBIT(fFlags, kUseCentralPixel) ? (*fEvt)[id].GetNumPhotons() : 0;
+        perr[i]  = TESTBIT(fFlags, kUseCentralPixel) ? (*fEvt)[id].GetErrorPhot()  : 0;
         for (int j=0; j<n; j++)
         {
@@ -165 +170 @@
         }
 
-        nphot[i] /= fUseCentralPixel ? n+1 : n;
-        perr[i]  /= fUseCentralPixel ? n+1 : n;
-    }
-
-    if (fUseInterpolation && fGeomCam)
+        nphot[i] /= TESTBIT(fFlags, kUseCentralPixel) ? n+1 : n;
+        perr[i]  /= TESTBIT(fFlags, kUseCentralPixel) ? n+1 : n;
+    }
+
+    if (TESTBIT(fFlags, kUseInterpolation) && fGeomCam)
         for (UShort_t i=0; i<entries; i++)
         {
@@ -211 +216 @@
 Bool_t MBlindPixelCalc::Process()
 {
-    if (fUseInterpolation && fGeomCam)
+    if (TESTBIT(fFlags, kUseInterpolation) && fGeomCam)
         Interpolate();
     else
@@ -289 +294 @@
 }
 
-
+void MBlindPixelCalc::StreamPrimitive(ofstream &out) const
+{
+    out << "   MBlindPixelCalc " << GetUniqueName();
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
+    {
+        out << "(\"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+        out <<")";
+    }
+    out << ";" << endl;
+
+    if (TESTBIT(fFlags, kUseInterpolation))
+        out << "   " << GetUniqueName() << ".SetUseInterpolation();" << endl;
+    if (TESTBIT(fFlags, kUseCentralPixel))
+        out << "   " << GetUniqueName() << ".SetUseCentralPixel();" << endl;
+
+    if (fPixelsID.GetSize()==0)
+        return;
+
+    out << "   {" << endl;
+    out << "      TArrayS dummy;" << endl;
+    for (int i=0; i<fPixelsID.GetSize(); i++)
+        out << "      dummy[" << i << "]=" << ((TArrayS)fPixelsID)[i] << ";" << endl;
+    out << "      " << GetUniqueName() << ".SetPixels(dummy);" << endl;
+    out << "   }" << endl;
+}

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.h

@@ -23 +23 @@
     TArrayS fPixelsID;  // Pixel IDs for blind pixels, which are entered by the user.
 
-    Bool_t fUseInterpolation;
-    Bool_t fUseCentralPixel;
+    Byte_t fFlags;      // flag for the method which is used
+
+    enum
+    {
+        kUseInterpolation = 1,
+        kUseCentralPixel  = 2
+    };
 
     void Interpolate() const;
     void Unmap() const;
+    void StreamPrimitive(ofstream &out) const;
 
 public:
     MBlindPixelCalc(const char *name=NULL, const char *title=NULL);
 
-    void SetUseInterpolation(Bool_t b=kTRUE) { fUseInterpolation=kTRUE; }
-    void SetUseCetralPixel(Bool_t b=kTRUE)   { fUseCentralPixel=kTRUE; }
+    void SetUseInterpolation(Bool_t b=kTRUE)
+    {
+        b ? SETBIT(fFlags, kUseInterpolation) : CLRBIT(fFlags, kUseInterpolation);
+    }
+    void SetUseCetralPixel(Bool_t b=kTRUE)
+    {
+        b ? SETBIT(fFlags, kUseCentralPixel) : CLRBIT(fFlags, kUseCentralPixel);
+    }
 
     Bool_t PreProcess(MParList *pList);
@@ -39 +51 @@
 
     void SetPixels(Int_t num, Short_t *ids);
+    void SetPixels(const TArrayS pix) { SetPixels(pix.GetSize(), pix.GetArray()); }
     virtual Bool_t ReInit(MParList *pList);
 
-    ClassDef(MBlindPixelCalc, 0) // task to disable given pixels for analysis
+    ClassDef(MBlindPixelCalc, 1) // task to deal with hot spots (star, broken pixels, etc)
 }; 
 

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc

@@ -45 +45 @@
 ClassImp(MHillasSrcCalc);
 
+static const TString gsDefName  = "MHillasSrcCalc";
+static const TString gsDefTitle = "Calculate position dependant image parameters";
+
 // -------------------------------------------------------------------------
 //
@@ -55 +58 @@
 MHillasSrcCalc::MHillasSrcCalc(const char *src, const char *hil,
                                const char *name, const char *title)
+    : fHillas(NULL), fSrcPos(NULL), fHillasSrc(NULL)
 {
-    fName  = name  ? name  : "MHillasSrcCalc";
-    fTitle = title ? title : "add parameters dependent on source position (MHillasSrc)";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     fSrcName    = src;
@@ -122 +126 @@
         out << "\"" << fSrcName << "\"";
 
+    out << ", ";
+
     if (fHillasSrc)
         out << "&" << fHillasSrc->GetUniqueName();
@@ -127 +133 @@
         out << "\"" << fHillasName << "\"";
 
-    out << ", \"" << fName << "\", \"" << fTitle << "\");" << endl;
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
+    {
+        out << ", \"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+    }
+    out << ");" << endl;
 }

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h

@@ -13 +13 @@
 {
 private:
-    MHillas    *fHillas;     // Pointer to the source independant hillas parameters
-    MSrcPosCam *fSrcPos;     // Pointer to the source position
-    MHillasSrc *fHillasSrc;  // Pointer to the output container for the source dependant parameters
+    MHillas    *fHillas;     //! Pointer to the source independant hillas parameters
+    MSrcPosCam *fSrcPos;     //! Pointer to the source position
+    MHillasSrc *fHillasSrc;  //! Pointer to the output container for the source dependant parameters
 
     TString     fSrcName;

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -68 +68 @@
 };
 
+static const TString gsDefName  = "MImgCleanStd";
+static const TString gsDefTitle = "Task to perform a standard image cleaning";
+
 // --------------------------------------------------------------------------
 //
@@ -78 +81 @@
     : fCleanLvl1(lvl1), fCleanLvl2(lvl2)
 {
-    fName  = name  ? name  : "MImgCleanStd";
-    fTitle = title ? title : "Task which does a standard image cleaning";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     Print();
@@ -417 +420 @@
 {
     out << "   MImgCleanStd " << GetUniqueName() << "(";
-    out << fCleanLvl1 << ", " << fCleanLvl2 << ", \"";
-    out << fName << "\", \"" << fTitle << "\");" << endl;
-}
+    out << fCleanLvl1 << ", " << fCleanLvl2;
+
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
+    {
+        out << ", \"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+    }
+    out << ");" << endl;
+}

trunk/MagicSoft/Mars/manalysis/MSrcPosCam.cc

@@ -41 +41 @@
 ClassImp(MSrcPosCam);
 
+static const TString gsDefName  = "MSrcPosCam";
+static const TString gsDefTitle = "Virtual source position in the camera";
+
 // --------------------------------------------------------------------------
 //
@@ -47 +50 @@
 MSrcPosCam::MSrcPosCam(const char *name, const char *title) : fX(0), fY(0)
 {
-    fName  = name  ? name  : "MSrcPosCam";
-    fTitle = title ? title : "Source position in the camera";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 }
 
@@ -90 +93 @@
 void MSrcPosCam::StreamPrimitive(ofstream &out) const
 {
-    out << "   MSrcPosCam " << GetUniqueName() << "(\"";
-    out << fName << "\", \"" << fTitle << "\");" << endl;
+    out << "   MSrcPosCam " << GetUniqueName();
+    if (fName!=gsDefName)
+    {
+        out << "(\"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+        out <<")";
+    }
+    out << ";" << endl;
 
     out << "   " << GetUniqueName() << ".SetXY(" << fX << ", " << fY << ");" << endl;}

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -92 +92 @@
 //! Also we can derive MEvtLoop from MTaskList to have a static tasklist, too
 //!
+
+TList *gListOfPrimitives; // forard declaration in MParContainer.h
 
 // --------------------------------------------------------------------------
@@ -346 +348 @@
 
     fout << "}" << endl;
+
+    *fLog << inf << "Macro '" << name << "' written." << endl;
 }
 
@@ -365 +369 @@
         out << endl;
     }
+
+    gListOfPrimitives = new TList;
 
     if (fParList)
@@ -376 +382 @@
     out << "   if (!evtloop.Eventloop())" << endl;
     out << "      return;" << endl;
+
+    gListOfPrimitives->ForEach(TObject, ResetBit)(BIT(15));
+    delete gListOfPrimitives;
+    gListOfPrimitives = 0;
+
+    // remove all objects with BIT(15) set from gObjectTable
 }
 
@@ -477 +489 @@
     HasDuplicateNames(list, "MEvtLoop::Read");
 
+    *fLog << inf << "Eventloop '" << name << "' read from file." << endl;
+
     return n;
+}
+
+// --------------------------------------------------------------------------
+//
+// If available print the contents of the parameter list.
+//
+void MEvtLoop::Print(Option_t *opt="") const
+{
+    if (fParList)
+        fParList->Print();
+    else
+        *fLog << all << "MEvtloop: No Parameter List available." << endl;
 }
 
@@ -530 +556 @@
     HasDuplicateNames(list, "MEvtLoop::Write");
 
+    *fLog << inf << "Eventloop written to file as " << name << "." << endl;
+
     return n;
 }

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -53 +53 @@
     void SavePrimitive(ofstream &out, Option_t *o="");
 
-    Int_t Read(const char *name);
-    Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0);
+    Int_t Read(const char *name="Evtloop");
+    Int_t Write(const char *name="Evtloop", Int_t option=0, Int_t bufsize=0);
+
+    void Print(Option_t *opt="") const;
 
     ClassDef(MEvtLoop, 1) // Class to execute the tasks in a tasklist
 };
 
+R__EXTERN TList *gListOfPrimitives; // instantiation in MEvtLoop
+
 #endif

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -51 +51 @@
 #include "MLogManip.h"
 
+#include "MEvtLoop.h"    // gListOfPrimitives
+
 ClassImp(MParContainer);
 
@@ -383 +385 @@
         return;
 
-    SetUniqueID(uid++/*gRandom->Uniform(kMaxInt)*/);
+    SetUniqueID(uid++);
+    SetBit(kIsSavedAsPrimitive);
+
+    if (gListOfPrimitives && !gListOfPrimitives->FindObject(this))
+        gListOfPrimitives->Add(this);
+
     StreamPrimitive(out);
-    SetBit(kIsSavedAsPrimitive);
 }
 

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -672 +672 @@
 {
     out << "   MParList " << GetUniqueName();
-    if (fName!=gsDefName)
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
     {
         out << "(\"" << fName << "\"";

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -525 +525 @@
 {
     out << "   MTaskList " << GetUniqueName();
-    if (fName!=gsDefName)
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
     {
         out << "(\"" << fName << "\"";

trunk/MagicSoft/Mars/mhist/MBinning.cc

@@ -120 +120 @@
 {
     out << "   MBinning " << GetUniqueName();
-    if (fName!=gsDefName)
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
     {
         out << "(\"" << fName << "\"";

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -148 +148 @@
     ApplyBinning(*plist, "Length", fLength);
     ApplyBinning(*plist, "Dist",   fDistC);
-    ApplyBinning(*plist, "Camera", fCenter);
     ApplyBinning(*plist, "Delta",  fDelta);
     ApplyBinning(*plist, "Size",   fSize);
+
+    const MBinning *bins = (MBinning*)plist->FindObject("BinningCamera");
+    if (!bins)
+        *fLog << warn << "Object 'BinningCamera' [MBinning] not found... no binning applied." << endl;
+    else
+        SetBinning(fCenter, bins, bins);
 
     return kTRUE;