Index: /trunk/Mars/msimcamera/MSimCalibrationSignal.cc
===================================================================
--- /trunk/Mars/msimcamera/MSimCalibrationSignal.cc	(revision 19667)
+++ /trunk/Mars/msimcamera/MSimCalibrationSignal.cc	(revision 19668)
@@ -228,19 +228,20 @@
     // We add an additional sample at the end to support a possible shift
     // of the start time of the first event by 0 to 1 sample.
-    const Int_t   ns = fRunHeader->GetNumSamplesHiGain()+1;
+    const Float_t  win  = (fHeader->GetNumSamplesHiGain()+1)/freq;
 
     // Length (ns), Pulse position (Units ns)
     const Float_t pp = fPulsePos->GetVal();
-    const Float_t pw = fPulse->GetWidth();
+    const Float_t pw = fPulse->GetWidth()/freq;
 
     const Float_t first = cnt>0 ? fEvt->GetFirst()->GetTime() : 0;
-    const Float_t last  = cnt>0 ? fEvt->GetLast()->GetTime()  : ns*freq;
-
-    fStat->SetTime(first-pp-pw, last-pp+pw + ns*freq);
+    const Float_t last  = cnt>0 ? fEvt->GetLast()->GetTime()  : win;
+
+    fStat->SetTime(first-pp-pw, last-pp + win);
+    fStat->SetLength(last-first);
     fStat->SetMaxIndex(fGeom->GetNumPixels()-1);
     fStat->SetReadyToSave();
 
     // FIXME: Jitter! (Own class?)
-    fTrigger->SetVal((pp+pw)*freq);
+    fTrigger->SetVal(pp+pw);
     fTrigger->SetReadyToSave();