Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3238)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3239)
@@ -4,4 +4,29 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/01/19: Thomas Bretz
+
+   * mhist/MHEvent.[h,cc]:
+     - Changed names of Event "types" to make them more descriptive.
+       Former kEvtSignal is now called kEvtSignalDensity, and indicates
+       pixel content scaled by area. Added kEvtSignalRaw, which 
+       corresponds to pixel content (with no scaling) in whatever units
+       (this depends on how the MHEvent object is filled!). The default
+       constructor initializes type=kEvtSignalRaw.
+
+   * mmain/MEventDisplay.cc
+     - Changed filling of evt1 and evt2. Now they are filled with raw 
+       content of MCerPhotEvt. Since in MEventDisplay, MCerPhotEvt is
+       still filled uncalibrated (hence in ADC counts), this means that 
+       what will be now shown in Mars' camera display is now the signal 
+       in each pixel without scaling with pixel area. Given that the 
+       default flat fielding is such that equal light density 
+       corresponds to equal absolute signal (in ADC counts), this is 
+       more reasonable, and allows to check for instance how the 
+       relative pixel gains are adjusted by looking at calibration 
+       events. To be FIXED: there is however an "inconsistency" in 
+       MEventDisplay, and it is that MCerPhotEvt is still used to keep
+       uncalibrated signals. To be replaced by MExtractedSignalCam?
+
+
  2004/01/19: Thomas Bretz
 
Index: trunk/MagicSoft/Mars/mhist/MHEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 3238)
+++ trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 3239)
@@ -122,6 +122,10 @@
     switch (fType)
     {
-    case kEvtSignal:
-        fHist->SetName("Signal");
+    case kEvtSignalRaw:
+        fHist->SetName("Signal (raw)");
+        fHist->SetYTitle("S [au]");
+        break;
+    case kEvtSignalDensity:
+        fHist->SetName("Signal density");
         fHist->SetYTitle("S [au]");
         break;
@@ -182,7 +186,10 @@
     switch (fType)
     {
-    case kEvtSignal: // Get NumPhotons without pixel-size scaling
-        //        fHist->SetCamContent(*event, 3);
-        //        break;
+    case kEvtSignalRaw:   // Get Content without pixel-size scaling
+        fHist->SetCamContent(*event, 3);
+        break;
+    case kEvtSignalDensity:
+        fHist->SetCamContent(*event, 0);
+        break;
     case kEvtPedestal:
         fHist->SetCamContent(*event, 0);
Index: trunk/MagicSoft/Mars/mhist/MHEvent.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEvent.h	(revision 3238)
+++ trunk/MagicSoft/Mars/mhist/MHEvent.h	(revision 3239)
@@ -20,7 +20,7 @@
 public:
     enum EventType_t {
-        kEvtSignal, kEvtPedestal, kEvtPedestalRMS,
-        kEvtRelativeSignal, kEvtCleaningLevels,
-        kEvtIdxMax, kEvtArrTime
+        kEvtSignalRaw, kEvtSignalDensity, kEvtPedestal, 
+        kEvtPedestalRMS, kEvtRelativeSignal, kEvtCleaningLevels,
+        kEvtIdxMax, kEvtArrTime 
     };
 
@@ -47,5 +47,5 @@
 
 public:
-    MHEvent(EventType_t type=kEvtSignal);
+    MHEvent(EventType_t type=kEvtSignalRaw);
     ~MHEvent();
 
Index: trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 3238)
+++ trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 3239)
@@ -156,6 +156,6 @@
     fEvtLoop->SetParList(plist);
 
-    MHEvent *evt1 = new MHEvent(MHEvent::kEvtSignal);
-    MHEvent *evt2 = new MHEvent(MHEvent::kEvtSignal);
+    MHEvent *evt1 = new MHEvent(MHEvent::kEvtSignalRaw);
+    MHEvent *evt2 = new MHEvent(MHEvent::kEvtSignalRaw);
     MHEvent *evt3 = new MHEvent(MHEvent::kEvtPedestal);
     MHEvent *evt4 = new MHEvent(MHEvent::kEvtPedestalRMS);