Changeset 3142 for trunk

Timestamp:

02/13/04 16:52:50 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MPrint.cc (modified) (1 diff)
• mhist/MHCamera.cc (modified) (8 diffs)
• mhist/MHCamera.h (modified) (2 diffs)
• mhist/MHEvent.cc (modified) (2 diffs)
• mjobs/MJCalibration.cc (modified) (2 diffs)
• mjobs/MJPedestal.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -79 +79 @@
    * macros/readMagic.C:
      - changed to use MInteractiveTask
+
+   * mbase/MPrint.cc:
+     - fixed debugging level of some output
+     
+   * mhist/MHCamera.[h,cc]:
+     - fixed handling in AddNotify (necessayr due to change of
+       inheritance from MCamEvent)
+     - replaced cout by gLog
+     - added fNotify to list of cleanups
+
+   * mhist/MHEvent.cc, mjobs/MJCalibration.cc,
+     mjobs/MJPedestal.cc:
+     - fixed usage of AddNotify
 
 

trunk/MagicSoft/Mars/mbase/MPrint.cc

@@ -131 +131 @@
     // If it couldn't get found stop Eventloop
     //
-    *fLog << err << dbginf << fObjName << " not found... ";
     if (TestBit(kSkip))
     {
-        *fLog << "removing task from list." << endl;
+        *fLog << warn << fObjName << " not found... removing task from list." << endl;
         return kSKIP;
     }
     else
     {
-        *fLog << "aborting." << endl;
+        *fLog << err << fObjName << " not found... aborting." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -35 +35 @@
 // Be carefull: Entries in this context means Entries/bin or Events
 //
+// FIXME? Maybe MHCamera can take the fLog object from MGeomCam?
+//
 ////////////////////////////////////////////////////////////////////////////
 #include "MHCamera.h"
@@ -83 +85 @@
 
     fNotify  = new TList;
+    fNotify->SetBit(kMustCleanup);
+    gROOT->GetListOfCleanups()->Add(fNotify);
 
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
@@ -611 +615 @@
 void MHCamera::Print(Option_t *) const
 {
-    cout << "Minimum: " << GetMinimum();
+    gLog << all << "Minimum: " << GetMinimum();
     if (fMinimum==-1111)
-        cout << " <autoscaled>";
-    cout << endl;
-    cout << "Maximum: " << GetMaximum();
+        gLog << " <autoscaled>";
+    gLog << endl;
+    gLog << "Maximum: " << GetMaximum();
     if (fMaximum==-1111)
-        cout << " <autoscaled>";
-    cout << endl;
+        gLog << " <autoscaled>";
+    gLog << endl;
 }
 
@@ -718 +722 @@
     if (ncolors>1 && ncolors<50)
     {
-        cout << "MHCamera::SetPalette: Only default palettes with 50 colors are allowed... ignored." << endl;
+        gLog << err << "MHCamera::SetPalette: Only default palettes with 50 colors are allowed... ignored." << endl;
         return;
     }
@@ -1157 +1161 @@
 void MHCamera::SavePrimitive(ofstream &out, Option_t *opt)
 {
-    cout << "MHCamera::SavePrimitive: Must be rewritten!" << endl;
+    gLog << err << "MHCamera::SavePrimitive: Must be rewritten!" << endl;
     /*
     if (!gROOT->ClassSaved(TCanvas::Class()))
@@ -1257 +1261 @@
 // ------------------------------------------------------------------------
 //
+// Add a MCamEvent which should be displayed when the user clicks on a
+// pixel.
+// Warning: The object MUST inherit from TObject AND MCamEvent
+//
+void MHCamera::AddNotify(TObject *obj)
+{
+    // Make sure, that the object derives from MCamEvent!
+    MCamEvent *evt = dynamic_cast<MCamEvent*>(obj);
+    if (!evt)
+    {
+        gLog << err << "ERROR: MHCamera::AddNotify - TObject doesn't inherit from MCamEvent... ignored." << endl;
+        return;
+    }
+
+    // Make sure, that it is deleted from the list too, if the obj is deleted
+    obj->SetBit(kMustCleanup);
+
+    // Add object to list
+    fNotify->Add(obj);
+}
+
+// ------------------------------------------------------------------------
+//
 // Execute a mouse event on the camera
 //
@@ -1275 +1302 @@
         return;
 
-    cout << GetTitle() << " <" << GetName() << ">" << endl;
-    cout << "Software Pixel Index: " << idx << endl;
-    cout << "Hardware Pixel Id:    " << idx+1 << endl;
-    cout << "Contents:             " << GetBinContent(idx+1);
+    gLog << all << GetTitle() << " <" << GetName() << ">" << endl;
+    gLog << "Software Pixel Index: " << idx << endl;
+    gLog << "Hardware Pixel Id:    " << idx+1 << endl;
+    gLog << "Contents:             " << GetBinContent(idx+1);
     if (GetBinError(idx+1)>0)
-        cout << " +/- " << GetBinError(idx+1);
-    cout << "  <" << (IsUsed(idx)?"on":"off") << ">" << endl;
+        gLog << " +/- " << GetBinError(idx+1);
+    gLog << "  <" << (IsUsed(idx)?"on":"off") << ">" << endl;
 
     if (fNotify && fNotify->GetSize()>0)
@@ -1306 +1333 @@
         // FIXME: Make sure, that the old histograms are really deleted.
         //        Are they already deleted?
-        fNotify->ForEach(MCamEvent, DrawPixelContent)(idx);
+
+        // The dynamic_cast is necessary here: We cannot use ForEach
+        TIter Next(fNotify);
+        MCamEvent *evt;
+        while ((evt=dynamic_cast<MCamEvent*>(Next())))
+            evt->DrawPixelContent(idx);
+
         gPad->Modified();
         gPad->Update();

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -179 +179 @@
     //void  SetOptStat(Int_t os=-1) { fOptStat = os; } // *MENU*
 
-    void     AddNotify(const MCamEvent &event) { fNotify->Add((TObject*)(&event)); }
+    void     AddNotify(TObject *event);
 
     Stat_t   GetMean(Int_t axis=-1) const;
@@ -187 +187 @@
 
     TH1D    *Projection(const char *name="_py") const;
-
-    //void SetStatusBar(TGStatusBar *bar) { fStatusBar = bar; }
 
     const MGeomCam &GetGeomCam() const { return *fGeomCam; }

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -118 +118 @@
 
     fHist = new MHCamera(*cam);
-    fHist->AddNotify(*fClone);
+    fHist->AddNotify(fClone);
 
     switch (fType)
@@ -182 +182 @@
     switch (fType)
     {
-    case kEvtSignal:
+    case kEvtSignal: // Get NumPhotons without pixel-size scaling
+        //        fHist->SetCamContent(*event, 3);
+        //        break;
     case kEvtPedestal:
         fHist->SetCamContent(*event, 0);

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -166 +166 @@
 void MJCalibration::CamDraw(TCanvas &c, const Int_t x, const Int_t y, const MHCamera &cam1, const Int_t fit)
 {
-
-
     c.cd(x);
     gPad->SetBorderMode(0);
     MHCamera *obj1=(MHCamera*)cam1.DrawCopy("hist");
-    obj1->AddNotify(fCalibrationCam);
+    obj1->AddNotify(static_cast<TObject*>(&fCalibrationCam));
 
     c.cd(x+y);
@@ -177 +175 @@
     obj1->Draw();
 
-    if (fit)
-      {
-        c.cd(x+2*y);
-        gPad->SetBorderMode(0);
-        DrawProjection(obj1, fit);
-      }
+    if (!fit)
+        return;
+
+    c.cd(x+2*y);
+    gPad->SetBorderMode(0);
+    DrawProjection(obj1, fit);
 }
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -174 +174 @@
     gPad->SetBorderMode(0);
     MHCamera *obj1=(MHCamera*)cam1.DrawCopy("hist");
-    obj1->AddNotify(fPedestalCam);
+    obj1->AddNotify(static_cast<TObject*>(&fPedestalCam));
 
     c.cd(x+y);