Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8000)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8001)
@@ -20,5 +20,5 @@
  2006/10/02 Thomas Bretz
 
-   * callisto.rc:
+   * callisto.rc, callisto_Dec04Jan05.rc:
      - fixed some names of some resources (all commented out anyhow)
 
Index: trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc
===================================================================
--- trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc	(revision 8000)
+++ trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc	(revision 8001)
@@ -266,34 +266,34 @@
 #MJCalibration.MCalibrationChargeCalc.PheErrUpperLimit:   5.5
 
-#MJCalibration.MHCalibrationChargeCam.Debug:        no
-#MJCalibration.MHCalibrationChargeCam.LoGain:       yes
-#MJCalibration.MHCalibrationChargeCam.Oscillations: yes
-#MJCalibration.MHCalibrationChargeCam.SizeCheck:    yes
-#MJCalibration.MHCalibrationChargeCam.Averageing:   yes
-#MJCalibration.MHCalibrationChargeCam.HiGainNbins:  500
-#MJCalibration.MHCalibrationChargeCam.HiGainFirst:  -100.125
-#MJCalibration.MHCalibrationChargeCam.HiGainLast:   1899.875
-#MJCalibration.MHCalibrationChargeCam.LoGainNbins:   500
-#MJCalibration.MHCalibrationChargeCam.LoGainFirst:  -100.25
-#MJCalibration.MHCalibrationChargeCam.LoGainLast:   899.75
-#MJCalibration.MHCalibrationChargeCam.TimeLowerLimit: 1. 
-#MJCalibration.MHCalibrationChargeCam.TimeUpperLimit: 3. 
+#MJCalibration.MHCalibrationChargeCam.Debug:           no
+#MJCalibration.MHCalibrationChargeCam.LoGain:          yes
+#MJCalibration.MHCalibrationChargeCam.Oscillations:    yes
+#MJCalibration.MHCalibrationChargeCam.SizeCheck:       yes
+#MJCalibration.MHCalibrationChargeCam.Averageing:      yes
+#MJCalibration.MHCalibrationChargeCam.HiGainNbins:     500
+#MJCalibration.MHCalibrationChargeCam.HiGainFirst:     -100.125
+#MJCalibration.MHCalibrationChargeCam.HiGainLast:      1899.875
+#MJCalibration.MHCalibrationChargeCam.LoGainNbins:     500
+#MJCalibration.MHCalibrationChargeCam.LoGainFirst:     -100.25
+#MJCalibration.MHCalibrationChargeCam.LoGainLast:      899.75
+#MJCalibration.MHCalibrationChargeCam.TimeLowerLimit:  1. 
+#MJCalibration.MHCalibrationChargeCam.TimeUpperLimit:  3. 
 #MJCalibration.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
 #MJCalibration.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005 
-MJCalibration.MHCalibrationChargeCam.ProbLimit:     1.0E-18
-#MJCalibration.MHCalibrationChargeCam.OverflowLimit: 0.005
+MJCalibration.MHCalibrationChargeCam.ProbLimit:        1.0E-18
+#MJCalibration.MHCalibrationChargeCam.OverflowLimit:   0.005
 #MJCalibration.MHCalibrationChargeCam.PulserFrequency: 500
 
-#MJCalibration.MHCalibrationRelTimeCam.Debug:        no
-#MJCalibration.MHCalibrationRelTimeCam.LoGain:       no
-#MJCalibration.MHCalibrationRelTimeCam.Oscillations:  yes
-#MJCalibration.MHCalibrationRelTimeCam.SizeCheck:    yes
-#MJCalibration.MHCalibrationRelTimeCam.Averageing:   yes
-#MJCalibration.MHCalibrationRelTimeCam.HiGainNbins:  210
-#MJCalibration.MHCalibrationRelTimeCam.HiGainFirst:  -5.
-#MJCalibration.MHCalibrationRelTimeCam.HiGainLast:   10.
+#MJCalibration.MHCalibrationRelTimeCam.Debug:           no
+#MJCalibration.MHCalibrationRelTimeCam.LoGain:          no
+#MJCalibration.MHCalibrationRelTimeCam.Oscillations:    yes
+#MJCalibration.MHCalibrationRelTimeCam.SizeCheck:       yes
+#MJCalibration.MHCalibrationRelTimeCam.Averageing:      yes
+#MJCalibration.MHCalibrationRelTimeCam.Nbins:           300
+#MJCalibration.MHCalibrationRelTimeCam.First:           -4.975
+#MJCalibration.MHCalibrationRelTimeCam.Last:            10.025
 #MJCalibration.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25
-#MJCalibration.MHCalibrationRelTimeCam.ProbLimit:    0.00001
-#MJCalibration.MHCalibrationRelTimeCam.OverflowLimit: 0.005
+#MJCalibration.MHCalibrationRelTimeCam.ProbLimit:       0.00001
+#MJCalibration.MHCalibrationRelTimeCam.OverflowLimit:   0.005
 #MJCalibration.MHCalibrationRelTimeCam.PulserFrequency: 500
 
@@ -437,21 +437,21 @@
 # Setup interlaced calibration events histogramming
 # -------------------------------------------------------------------------
-#MJCalibrateSignal.MHCalibrationChargeCam.Debug:        no
-#MJCalibrateSignal.MHCalibrationChargeCam.LoGain:       yes
-MJCalibrateSignal.MHCalibrationChargeCam.Oscillations:  no
-#MJCalibrateSignal.MHCalibrationChargeCam.SizeCheck:    yes
-#MJCalibrateSignal.MHCalibrationChargeCam.Averageing:   yes
-#MJCalibrateSignal.MHCalibrationChargeCam.HiGainNbins:  500
-#MJCalibrateSignal.MHCalibrationChargeCam.HiGainFirst:  -100.5
-#MJCalibrateSignal.MHCalibrationChargeCam.HiGainLast:   1899.5
-MJCalibrateSignal.MHCalibrationChargeCam.LoGainNbins:   250
-MJCalibrateSignal.MHCalibrationChargeCam.LoGainFirst:   -98
-MJCalibrateSignal.MHCalibrationChargeCam.LoGainLast:    902
-#MJCalibrateSignal.MHCalibrationChargeCam.TimeLowerLimit: 1. 
-#MJCalibrateSignal.MHCalibrationChargeCam.TimeUpperLimit: 3. 
+#MJCalibrateSignal.MHCalibrationChargeCam.Debug:           no
+#MJCalibrateSignal.MHCalibrationChargeCam.LoGain:          yes
+MJCalibrateSignal.MHCalibrationChargeCam.Oscillations:    no
+#MJCalibrateSignal.MHCalibrationChargeCam.SizeCheck:       yes
+#MJCalibrateSignal.MHCalibrationChargeCam.Averageing:      yes
+#MJCalibrateSignal.MHCalibrationChargeCam.HiGainNbins:     500
+#MJCalibrateSignal.MHCalibrationChargeCam.HiGainFirst:     -100.5
+#MJCalibrateSignal.MHCalibrationChargeCam.HiGainLast:      1899.5
+MJCalibrateSignal.MHCalibrationChargeCam.LoGainNbins:     250
+MJCalibrateSignal.MHCalibrationChargeCam.LoGainFirst:     -98
+MJCalibrateSignal.MHCalibrationChargeCam.LoGainLast:      902
+#MJCalibrateSignal.MHCalibrationChargeCam.TimeLowerLimit:  1. 
+#MJCalibrateSignal.MHCalibrationChargeCam.TimeUpperLimit:  3. 
 #MJCalibrateSignal.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
 #MJCalibrateSignal.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005 
-#MJCalibrateSignal.MHCalibrationChargeCam.ProbLimit:    0.0001
-#MJCalibrateSignal.MHCalibrationChargeCam.OverflowLimit: 0.005
+#MJCalibrateSignal.MHCalibrationChargeCam.ProbLimit:       0.0001
+#MJCalibrateSignal.MHCalibrationChargeCam.OverflowLimit:   0.005
 MJCalibrateSignal.MHCalibrationChargeCam.PulserFrequency: 50
 
@@ -459,15 +459,15 @@
 # Setup relative time interlaced calibration
 # -------------------------------------------------------------------------
-#MJCalibrateSignal.MHCalibrationRelTimeCam.Debug:        no
-#MJCalibrateSignal.MHCalibrationRelTimeCam.LoGain:       no
-MJCalibrateSignal.MHCalibrationRelTimeCam.Oscillations:  no
-#MJCalibrateSignal.MHCalibrationRelTimeCam.SizeCheck:    yes
-#MJCalibrateSignal.MHCalibrationRelTimeCam.Averageing:   yes
-#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainNbins:  210
-#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainFirst:  -5.
-#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainLast:   10.
+#MJCalibrateSignal.MHCalibrationRelTimeCam.Debug:           no
+#MJCalibrateSignal.MHCalibrationRelTimeCam.LoGain:          no
+MJCalibrateSignal.MHCalibrationRelTimeCam.Oscillations:    no
+#MJCalibrateSignal.MHCalibrationRelTimeCam.SizeCheck:       yes
+#MJCalibrateSignal.MHCalibrationRelTimeCam.Averageing:      yes
+#MJCalibrateSignal.MHCalibrationRelTimeCam.Nbins:           300
+#MJCalibrateSignal.MHCalibrationRelTimeCam.First:           -4.975
+#MJCalibrateSignal.MHCalibrationRelTimeCam.Last:            10.025
 #MJCalibrateSignal.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25
-#MJCalibrateSignal.MHCalibrationRelTimeCam.ProbLimit:    0.00001
-#MJCalibrateSignal.MHCalibrationRelTimeCam.OverflowLimit: 0.005
+#MJCalibrateSignal.MHCalibrationRelTimeCam.ProbLimit:       0.00001
+#MJCalibrateSignal.MHCalibrationRelTimeCam.OverflowLimit:   0.005
 MJCalibrateSignal.MHCalibrationRelTimeCam.PulserFrequency: 50
 
Index: trunk/MagicSoft/Mars/mdata/MDataElement.cc
===================================================================
--- trunk/MagicSoft/Mars/mdata/MDataElement.cc	(revision 8000)
+++ trunk/MagicSoft/Mars/mdata/MDataElement.cc	(revision 8001)
@@ -59,4 +59,13 @@
     : fMatrixName(member), fNumCol(col), fMatrix(NULL)
 {
+    if (fNumCol>=0)
+        return;
+
+    const Int_t pos = fMatrixName.First('[');
+    if (pos<=0)
+        return;
+
+    fNumCol     = atoi(fMatrixName.Data()+pos+1);
+    fMatrixName = fMatrixName(0, pos);
 }
 
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 8000)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 8001)
@@ -686,24 +686,26 @@
 }
 
-void MHCalibrationRelTimeCam::CheckOverflow( MHCalibrationPix &pix )
-{
-
-  if (pix.IsExcluded())
-    return;
-
-  TH1F *hist = pix.GetHGausHist();
-  
-  Stat_t overflow = hist->GetBinContent(hist->GetNbinsX()+1);
-  if (overflow > fOverflowLimit*hist->GetEntries())
-    {
-      *fLog << warn << "HiGain Hist-overflow " << overflow
-            << " times in " << pix.GetName() << " (w/o saturation!) " << endl;
-    }
-  
-  overflow = hist->GetBinContent(0);
-  if (overflow > fOverflowLimit*hist->GetEntries())
-    {
-      *fLog << warn << "HiGain Hist-underflow " << overflow
-            << " times in " << pix.GetName() << " (w/o saturation!) " << endl;
+void MHCalibrationRelTimeCam::CheckOverflow( MHCalibrationPix &pix ) const
+{
+    if (pix.IsExcluded())
+        return;
+
+    const TH1F &hist = *pix.GetHGausHist();
+
+    const Int_t   n   = hist.GetNbinsX();
+    const Float_t max = fOverflowLimit*hist.GetEntries();
+
+    const Stat_t overflow = hist.GetBinContent(n+1);
+    if (overflow > max)
+    {
+        *fLog << warn << overflow << " overflows above " << hist.GetBinLowEdge(n);
+        *fLog << " in " << pix.GetName() << " (w/o saturation!) " << endl;
+    }
+  
+    const Stat_t underflow = hist.GetBinContent(0);
+    if (underflow > max)
+    {
+        *fLog << warn << underflow << " underflows below " << hist.GetBinLowEdge(1);
+        *fLog << " in " << pix.GetName() << " (w/o saturation!) " << endl;
     }
 }
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h	(revision 8000)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h	(revision 8001)
@@ -55,5 +55,5 @@
   void   FinalizeBadPixels();
 
-  void   CheckOverflow( MHCalibrationPix &pix);
+  void   CheckOverflow(MHCalibrationPix &pix) const;
   void   DrawDataCheckPixel(MHCalibrationPix &pix, const Float_t refline);
   void   DisplayRefLines( const TH1F *hist, const Float_t refline) const;