Changeset 1740 for trunk/MagicSoft

Timestamp:

01/31/03 14:21:48 (22 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/triglvl2.C (added)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MTrigLvl2.cc (added)
• manalysis/MTrigLvl2.h (added)
• manalysis/MTrigLvl2FillTask.cc (added)
• manalysis/MTrigLvl2FillTask.h (added)
• manalysis/Makefile (modified) (2 diffs)
• mgui/MCamDisplay.cc (modified) (1 diff)
• mgui/MCamDisplay.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
 
                                                          -*-*- END -*-*-
+
+ 2003/01/31  Antonio Stamerra & Marcos Lopez
+
+  * mgui/MCamDisplay.[cc|h]
+    - Added a new function MCamDisplay::SetPix(const Int_t pixnum, const Int_t
+   color, Float_t min, Float_t max) which just set the color of a given pixel 
+
+  * created two new classes for simulating the second level trigger in the 
+    directory MAnalysis:
+    - MTrigLvl2.[cc|h]         // Implement the Lvl2 topology and selection
+                               // strategies
+    - MTrigLvl2FillTask.[cc|h] // For a given MMc event, fill the MTrigLvl2 
+                                  with the Lvl1 trigger information 
+
+  * manalysis/Makefile
+    - Added -I../mgui
+
+  * Added macro macros/triglvl2.C which uses the above classes.
+
 
  2003/01/27: Robert Wagner

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -46 +46 @@
 #pragma link C++ class MApplyPadding+;
 
+#pragma link C++ class MTrigLvl2+;
+#pragma link C++ class MTrigLvl2FillTask+;
+
+
 #endif

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -23 +23 @@
 #
 INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom \
-           -I../mdata -I../mhist 
+           -I../mdata -I../mhist -I../mgui 
 
 #------------------------------------------------------------------------------
@@ -58 +58 @@
            MSigmabarParam.cc \
            MSigmabarCalc.cc \
-           MApplyPadding.cc
+           MApplyPadding.cc \
+           MTrigLvl2.cc \
+           MTrigLvl2FillTask.cc
 
 SRCS    = $(SRCFILES)

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -942 +942 @@
  }
  */
+
+
+// ------------------------------------------------------------------------
+//
+// Function introduced  (31-01-03)
+//
+void MCamDisplay::SetPix(const Int_t pixnum, const Int_t color, Float_t min, Float_t max)
+{ 
+    (*this)[pixnum].SetFillColor(GetColor(color, min, max));
+
+}

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -90 +90 @@
     void SetInvDeepBlueSeaPalette(); // *MENU*
 
+
+    
+    void  SetPix(const Int_t pixnum, const Int_t color, Float_t min, Float_t max);      // New function added by M.Lopez in 31-01-03
+
+
     ClassDef(MCamDisplay, 0) // Displays the magic camera
 };