Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5806)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5807)
@@ -20,8 +20,38 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/01/12 Thomas Bretz
+
+   * manalysis/MMatrixLoop.cc:
+     - changed name to MRead because it now derives from MRead
+
+   * mbase/MEvtLoop.[h,cc]:
+     - implemented an option not to cascade the status display to the
+       parameter list in PreProcess
+
+   * mhflux/MHAlpha.cc:
+     - changed name of "Significance" to "MinimizationValue"
+     - return -significance to have a value being minimized
+
+   * mhist/MHCamera.cc:
+     - fixed output of text in legend
+
+   * mhist/MHEvent.[h,cc]:
+     - implemented new options for calibrated pedestals
+
+   * mmain/MEventDisplay.cc:
+     - fixed to support latest changes in MJCalibrateSignal
+
+   * mpedestal/MPedPhotCam.cc:
+     - added new options in GetPixelContent (4 and 5) to support
+       a correct camera display
+
+
+
  2005/01/11 Abelardo Moralejo
 
    * mjobs/Makefile
      - added missing include -I ../mtrigger
+
+
 
  2005/01/11 Thomas Bretz
Index: trunk/MagicSoft/Mars/manalysis/MMatrixLoop.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMatrixLoop.cc	(revision 5806)
+++ trunk/MagicSoft/Mars/manalysis/MMatrixLoop.cc	(revision 5807)
@@ -38,5 +38,5 @@
 ClassImp(MMatrixLoop);
 
-const TString MMatrixLoop::gsDefName  = "MMatrixLoop";
+const TString MMatrixLoop::gsDefName  = "MRead";
 const TString MMatrixLoop::gsDefTitle = "Loop through a MHMatrix (instead of reading from a file)";
 
Index: trunk/MagicSoft/Mars/mbase/MEvtLoop.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MEvtLoop.cc	(revision 5806)
+++ trunk/MagicSoft/Mars/mbase/MEvtLoop.cc	(revision 5807)
@@ -244,5 +244,6 @@
         fDisplay->StartUpdate();
         // Cascade display through childs
-        fParList->SetDisplay(fDisplay);
+        if (!TestBit(kPrivateDisplay))
+            fParList->SetDisplay(fDisplay);
     }
 #endif
Index: trunk/MagicSoft/Mars/mbase/MEvtLoop.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MEvtLoop.h	(revision 5806)
+++ trunk/MagicSoft/Mars/mbase/MEvtLoop.h	(revision 5807)
@@ -32,5 +32,5 @@
     ULong_t fNumEvents;        //!
 
-    enum { kIsOwner = BIT(14) };
+    enum { kIsOwner = BIT(14), kPrivateDisplay = BIT(15) };
 
     Bool_t HasDuplicateNames(const TString txt) const;
@@ -54,4 +54,5 @@
     MStatusDisplay *GetDisplay() { return fDisplay; }
     void SetDisplay(MStatusDisplay *d);
+    void SetPrivateDisplay(Bool_t b=kTRUE) { b ? SetBit(kPrivateDisplay) : ResetBit(kPrivateDisplay); }
 
     void SetOwner(Bool_t enable=kTRUE);
Index: trunk/MagicSoft/Mars/mhflux/MHAlpha.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHAlpha.cc	(revision 5806)
+++ trunk/MagicSoft/Mars/mhflux/MHAlpha.cc	(revision 5807)
@@ -289,5 +289,5 @@
         *fLog << warn << "MTime not found... ignored." << endl;
 
-    fResult = (MParameterD*)const_cast<MParList*>(pl)->FindCreateObj("MParameterD", "Significance");
+    fResult = (MParameterD*)const_cast<MParList*>(pl)->FindCreateObj("MParameterD", "MinimizationValue");
     if (!fResult)
         return kFALSE;
@@ -824,5 +824,5 @@
 
     if (fResult)
-        fResult->SetVal(fFit.GetSignificance());
+        fResult->SetVal(-fFit.GetSignificance());
 
     if (!fSkipHistEnergy)
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 5806)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 5807)
@@ -1471,5 +1471,5 @@
 
     text = "";
-    text += (float)((int)(range*.3*fGeomCam->GetConvMm2Deg()*10))/10;
+    text += Form("%.2f", (float)((int)(range*.3*fGeomCam->GetConvMm2Deg()*10))/10);
     text += "\\circ";
     text = text.Strip(TString::kLeading);
Index: trunk/MagicSoft/Mars/mhist/MHEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 5806)
+++ trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 5807)
@@ -139,4 +139,12 @@
         fHist->SetYTitle("\\sigma_{P} [au]");
         break;
+    case kEvtPedPhot:
+        fHist->SetName("Pedestal");
+        fHist->SetYTitle("P [\\gamma]");
+        break;
+    case kEvtPedPhotRMS:
+        fHist->SetName("Pedestal RMS");
+        fHist->SetYTitle("\\sigma_{P} [\\gamma]");
+        break;
     case kEvtCleaningLevels:
         if (!fImgCleanStd)
@@ -208,4 +216,10 @@
     case kEvtPedestalRMS:
         fHist->SetCamContent(*event, 1);
+        break;
+    case kEvtPedPhot:
+        fHist->SetCamContent(*event, 4);
+        break;
+    case kEvtPedPhotRMS:
+        fHist->SetCamContent(*event, 5);
         break;
     case kEvtCleaningLevels:
Index: trunk/MagicSoft/Mars/mhist/MHEvent.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEvent.h	(revision 5806)
+++ trunk/MagicSoft/Mars/mhist/MHEvent.h	(revision 5807)
@@ -20,7 +20,8 @@
 public:
     enum EventType_t {
-        kEvtSignalRaw, kEvtSignalDensity, kEvtPedestal, 
-        kEvtPedestalRMS, kEvtCleaningLevels,
-        kEvtCleaningData,
+        kEvtSignalRaw, kEvtSignalDensity,
+        kEvtPedestal, kEvtPedestalRMS,
+        kEvtPedPhot, kEvtPedPhotRMS,
+        kEvtCleaningLevels, kEvtCleaningData,
         kEvtIdxMax, kEvtArrTime, kEvtTrigPix, kEvtIslandIndex
     };
Index: trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 5806)
+++ trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 5807)
@@ -258,6 +258,6 @@
     MHEvent *evt01 = new MHEvent(MHEvent::kEvtSignalRaw);
     MHEvent *evt02 = new MHEvent(MHEvent::kEvtSignalRaw);
-    MHEvent *evt03 = new MHEvent(MHEvent::kEvtPedestal);
-    MHEvent *evt04 = new MHEvent(MHEvent::kEvtPedestalRMS);
+    MHEvent *evt03 = new MHEvent(type==1?MHEvent::kEvtPedPhot:MHEvent::kEvtPedestal);
+    MHEvent *evt04 = new MHEvent(type==1?MHEvent::kEvtPedPhotRMS:MHEvent::kEvtPedestalRMS);
     MHEvent *evt06a= new MHEvent(MHEvent::kEvtCleaningData);
     MHEvent *evt06b= new MHEvent(MHEvent::kEvtCleaningLevels);
@@ -294,6 +294,6 @@
     MImgCleanStd       *clean  = new MImgCleanStd;
     MFillH             *fill02 = new MFillH(evt02, "MCerPhotEvt", "MFillH02");
-    MFillH             *fill03 = new MFillH(evt03, "MPedPhotCam", "MFillH03");
-    MFillH             *fill04 = new MFillH(evt04, "MPedPhotCam", "MFillH04");
+    MFillH             *fill03 = new MFillH(evt03, type==1?"MPedPhotFundamental":"MPedPhotCam", "MFillH03");
+    MFillH             *fill04 = new MFillH(evt04, type==1?"MPedPhotFromExtractorRndm":"MPedPhotCam", "MFillH04");
     MFillH             *fill06a= new MFillH(evt06a, "MCameraData", "MFillH06a");
     MFillH             *fill06b= new MFillH(evt06b, "MCameraData", "MFillH06b");
@@ -303,4 +303,7 @@
     MFillH             *fill09 = new MFillH(evt09, "MMcTriggerLvl2", "MFillH09");
     MFillH             *fill10 = new MFillH(evt10, "MCerPhotEvt",    "MFillH10");
+
+    if (type==1)
+        clean->SetNamePedPhotCam("MPedPhotFromExtractorRndm");
 
     // If no pedestal or no calibration file is availble
Index: trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc	(revision 5806)
+++ trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc	(revision 5807)
@@ -321,4 +321,10 @@
         val = (*this)[idx].GetNumEvents()>0 ? (*this)[idx].GetRms()/TMath::Sqrt((Float_t)(*this)[idx].GetNumEvents())/2. : -1;
         break;
+    case 4:
+        val = (*this)[idx].GetMean()*cam.GetPixRatio(idx);
+        break;
+    case 5:
+        val = (*this)[idx].GetRms()*TMath::Sqrt(cam.GetPixRatio(idx));
+        break;
     default:
 	return kFALSE;