Changeset 4883

Timestamp:

09/07/04 13:32:47 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHCamera.cc (modified) (2 diffs)
• mhist/MHCamera.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -63 +63 @@
      - implemented intensity recognition
 
+   * mhist/MHCamera.[h,cc]
+     - included functions AddCamContent(MArrayD...) and 
+       SetCamContent(MArrayD... )
 
 

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -82 +82 @@
 #include "MCamEvent.h"
 
+#include "MArrayD.h"
+
 #define kItemsLegend 48 // see SetPalette(1,0)
 
@@ -1201 +1203 @@
     {
         Fill(idx, const_cast<TArrayD&>(event)[idx]); // FIXME: Slow!
+
+        if (!used || (*const_cast<TArrayC*>(used))[idx])
+            SetUsed(idx);
+    }
+    fEntries++;
+}
+
+// ------------------------------------------------------------------------
+//
+// Call this function to add a MArrayD on top of the present contents.
+//
+void MHCamera::AddCamContent(const MArrayD &event, const TArrayC *used)
+{
+    if (event.GetSize()!=fNcells-2 || IsFreezed())
+        return;
+
+    if (used && used->GetSize()!=fNcells-2)
+        return;
+
+    for (Int_t idx=0; idx<fNcells-2; idx++)
+    {
+        Fill(idx, const_cast<MArrayD&>(event)[idx]); // FIXME: Slow!
 
         if (!used || (*const_cast<TArrayC*>(used))[idx])

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -13 +13 @@
 #ifndef ROOT_TArrayD
 #include <TArrayD.h>
+#endif
+#ifndef ROOT_MArrayD
+#include <MArrayD.h>
 #endif
 #ifndef ROOT_TClonesArray
@@ -146 +149 @@
     virtual void     AddCamContent(const MHCamera &evt, Int_t type=0);
     virtual void     AddCamContent(const TArrayD &arr, const TArrayC *used=NULL);
+    virtual void     AddCamContent(const MArrayD &arr, const TArrayC *used=NULL);
     virtual void     SetCamContent(const MCamEvent &evt, Int_t type=0) { Reset(); AddCamContent(evt, type); }
+    virtual void     SetCamContent(const MHCamera &d, Int_t type=0) { Reset(); AddCamContent(d, type); fEntries=d.fEntries; }
     virtual void     SetCamContent(const TArrayD &evt, const TArrayC *used=NULL) { Reset(); AddCamContent(evt, used); }
-    virtual void     SetCamContent(const MHCamera &d, Int_t type=0) { Reset(); AddCamContent(d, type); fEntries=d.fEntries; }
+    virtual void     SetCamContent(const MArrayD &evt, const TArrayC *used=NULL) { Reset(); AddCamContent(evt, used); }
 
     virtual void     SetCamError(const MCamEvent &evt, Int_t type=0);