Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 8169)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 8170)
@@ -26,4 +26,8 @@
    * datacenter/macros/plotdb.C:
      - implemented a possibility to show average values with RMS
+
+   * mjtrain/MJTrainSeparation.cc:
+     - do not print observation time statistics if observation time is
+       zero
 
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 8169)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 8170)
@@ -2,9 +2,28 @@
 
  *** <cvs>
+
+   - database: Website to plot values from the database has been added. 
 
    - general: The changes to the interpretation of phrases lead to
      a problem with the access of MHMatrix objects (eg. "M[0]")... fixed.
 
-   - database: Website to plot values from the database has been added. 
+   - callisto: Redone the signal extraction this includes:
+     + Unified the algorithms to extract the pedestal for all pedestal
+       extractions done
+     + Unification of hi- and lo-gain into one array
+     + Unification of hi- and lo-gain extraction for Spline and
+       Digital Filter (means now exactly the same algorithm is used,
+       not a copy-and-pasted one)
+     + Store pedestal subtracted data in a common place
+     + Improved extraction algorithms. If the algorithms search a 
+       maximum but don't find one they don't return the maximum anymore
+     + Improved the extraction such that a information for signal
+       and time which is consistent is returned
+     + replaced the numerical spline with a (not slower) analytical
+       solution
+     + Lowered the saturation limit from 250 to 245 to make sure that
+       we are far away in all pixels from problems with the clock-noise
+     + Changed the lo-gain start shift from 2.5 to 6.0 which gives
+       clearly smoother results (to be investigated further)
 
 
Index: /trunk/MagicSoft/Mars/datacenter/macros/fillstar.C
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/macros/fillstar.C	(revision 8169)
+++ /trunk/MagicSoft/Mars/datacenter/macros/fillstar.C	(revision 8170)
@@ -156,4 +156,6 @@
     Float_t psf   = 58.5480*mw - 37.3829;
     psf = TMath::Nint(psf*10)/10.;
+    if (psf<0)
+        psf=0;
     TString PSF = Form("%5.1f", psf);
     Int_t   num = (int)hmuon->GetEntries();
Index: /trunk/MagicSoft/Mars/mjtrain/MJTrainSeparation.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjtrain/MJTrainSeparation.cc	(revision 8169)
+++ /trunk/MagicSoft/Mars/mjtrain/MJTrainSeparation.cc	(revision 8170)
@@ -288,7 +288,9 @@
     }
 
-    *fLog << all << "Observation Time:     " << TMath::Nint(ontime/60) << "min" << endl;
-    *fLog << "Maximum Significance: " << Form("%.1f", sig1) << " [";
-    *fLog << Form("%.1f", sig1/TMath::Sqrt(ontime/3600)) << "/sqrt(h)]";
+    if (ontime>0)
+        *fLog << all << "Observation Time:     " << TMath::Nint(ontime/60) << "min" << endl;
+    *fLog << "Maximum Significance: " << Form("%.1f", sig1);
+    if (ontime>0)
+        *fLog << Form(" [%.1f/sqrt(h)]", sig1/TMath::Sqrt(ontime/3600));
     *fLog << endl;