Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 6205)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 6206)
@@ -161,5 +161,5 @@
 const Axis_t  MHCalibrationChargeCam::fgChargeLoGainFirst = -100.25;
 const Axis_t  MHCalibrationChargeCam::fgChargeLoGainLast  =  899.75;
-const Float_t MHCalibrationChargeCam::fgProbLimit         = 0.00001;
+const Float_t MHCalibrationChargeCam::fgProbLimit         = 0.00000001;
 const TString MHCalibrationChargeCam::gsHistName          = "Charge";
 const TString MHCalibrationChargeCam::gsHistTitle         = "Signals";
Index: trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc	(revision 6205)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc	(revision 6206)
@@ -64,4 +64,6 @@
 #include "MHCamEvent.h"
 #include "MHCalibrationTestCam.h"
+#include "MHCalibrationTestTimeCam.h"
+#include "MHCalibrationPix.h"
 
 #include "MReadMarsFile.h"
@@ -125,15 +127,14 @@
   
   // Create histograms to display
-  MHCamera disp1 (geomcam, "Test;Photons",           "Mean of calibrated Photons");
-  MHCamera disp2 (geomcam, "Test;SigmaPhotons",      "Sigma of calibrated photons");
-  MHCamera disp3 (geomcam, "Test;PhotonsPerArea",    "Equiv. Cherenkov Photons per Area");
-  MHCamera disp4 (geomcam, "Test;SigmaPhotPerArea",  "Sigma equiv. Cher. Photons per Area");
-  MHCamera disp5 (geomcam, "Test;Phot",              "Calibrated Photons from Fit");
-  MHCamera disp6 (geomcam, "Test;PhotPerArea",       "Calibrated Photons per Area from Fit");
+  MHCamera disp1 (geomcam, "Test;PhotoElectrons",    "Mean equiv. phes");
+  MHCamera disp2 (geomcam, "Test;SigmaPhes",         "Sigma equiv.phes");
+  MHCamera disp3 (geomcam, "Test;PhesPerArea",       "Equiv. Phes per Area");
+  MHCamera disp4 (geomcam, "Test;SigmaPhotPerArea",  "Sigma equiv. Phes per Area");
+  MHCamera disp5 (geomcam, "Test;Phot",              "Calibrated Phes from Fit");
+  MHCamera disp6 (geomcam, "Test;PhotPerArea",       "Calibrated Phes per Area from Fit");
   MHCamera disp7 (geomcam, "Test;NotInterpolate",    "Not interpolated pixels");
-  MHCamera disp8 (geomcam, "Test;DeviatingPhots",    "Deviating Number Photons");
+  MHCamera disp8 (geomcam, "Test;DeviatingPhots",    "Deviating Number Phes");
   MHCamera disp9 (geomcam, "Test;Arr.Times",         "Mean of calibrated Arr.Times");
   MHCamera disp10(geomcam, "Test;SigmaArr.Times",    "Sigma of calibrated Arr.Times");
-
 
   // Fitted charge means and sigmas
@@ -161,11 +162,11 @@
 
 
-  disp1.SetYTitle("Photons");
-  disp2.SetYTitle("\\sigma_{phot}");
-  disp3.SetYTitle("Photons per Area [mm^{-2}]");
-  disp4.SetYTitle("\\sigma_{phot} per Area [mm^{-2}]");
-
-  disp5.SetYTitle("Photons");
-  disp6.SetYTitle("Photons per Area [mm^{-2}]");
+  disp1.SetYTitle("Phes");
+  disp2.SetYTitle("\\sigma_{phe}");
+  disp3.SetYTitle("Phes per area [mm^{-2}]");
+  disp4.SetYTitle("\\sigma_{phe} per area [mm^{-2}]");
+
+  disp5.SetYTitle("Phes");
+  disp6.SetYTitle("Phes per area [mm^{-2}]");
   disp7.SetYTitle("[1]");
   disp8.SetYTitle("[1]");
@@ -516,5 +517,5 @@
   
   MHCamEvent evt0(0,"Signal", "Un-Calibrated Signal;;S [FADC cnts]" );
-  MHCamEvent evt1(3,"CalSig", "Calibrated and Interpolated Signal;;S [\\gamma]");
+  MHCamEvent evt1(0,"CalSig", "Calibrated and Interpolated Signal;;S [phe]");
   MHCamEvent evt2(0,"Times" , "Arrival Time;;T [slice]");
 
@@ -568,4 +569,17 @@
   tlist.PrintStatistics();
   
+  /*
+    MHCalibrationTestCam *hcam = (MHCalibrationTestCam*)plist.FindObject("MHCalibrationTestCam");
+    MHCalibrationPix &pix1 = (*hcam)(100);
+    pix1.DrawClone("");
+    gPad->SaveAs("test_test_100.ps");
+
+    MHCalibrationTestTimeCam *hccam = (MHCalibrationTestTimeCam*)plist.FindObject("MHCalibrationTestTimeCam");
+    MHCalibrationPix &pix11 = (*hccam)(100);
+    pix11.DrawClone("");
+    gPad->SaveAs("test_testtime_100.ps");
+  */
+    
+
   DisplayResult(plist);