Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4370)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4371)
@@ -19,4 +19,15 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/07/14: Hendrik Bartko
+   * msignal/MExtractTimeHighestIntegral.cc
+     - implemented the time calculation respective to the zero FADC
+       time sample, not respective to the first sample of the chosen
+       range
+   * msignal/ArrivalTimeCalc2.cc
+     - implemented the time calculation respective to the zero FADC
+       time sample, not respective to the first sample of the chosen
+       range
+
 
  2004/06/30: Thomas Bretz
Index: /trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc2.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc2.cc	(revision 4370)
+++ /trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc2.cc	(revision 4371)
@@ -244,5 +244,5 @@
             sat++;
 
-        pix.SetArrivalTime(timehi, deltatimehi, timelo, deltatimelo);
+        pix.SetArrivalTime(timehi+ Float_t(fHiGainFirst), deltatimehi, timelo + Float_t(fLoGainFirst), deltatimelo); 
 	pix.SetGainSaturation(sathi, sathi, satlo);
     }
Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeHighestIntegral.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractTimeHighestIntegral.cc	(revision 4370)
+++ /trunk/MagicSoft/Mars/msignal/MExtractTimeHighestIntegral.cc	(revision 4371)
@@ -204,5 +204,5 @@
 	{
 	  max = sum;
-	  ptrmax = p;
+	  ptrmax = p+1;
 	}
     }
@@ -225,5 +225,5 @@
   const Float_t pedsubtimesignalsum = timesignalsum - timesum*pedes;
 
-  time      = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum : 1;
+  time      = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum  + Float_t(fHiGainFirst): 1;
   deltatime = pedsubsum != 0 ? pedrms / pedsubsum * sqrt(timesquaredsum - fHiGainWindowSize*time) : 1;
 }
@@ -272,5 +272,5 @@
 	{
 	  max = sum;
-	  ptrmax = p;
+	  ptrmax = p+1;
 	}
     }
@@ -293,5 +293,5 @@
   const Float_t pedsubtimesignalsum = timesignalsum - timesum*pedes;
 
-  time      = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum : 1;
+  time      = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum  + Float_t(fLoGainFirst) : 1;
   deltatime = pedsubsum != 0 ? pedrms / pedsubsum * sqrt(timesquaredsum - fLoGainWindowSize*time) : 1;
 }