Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 1744)
+++ trunk/MagicSoft/Mars/Changelog	(revision 1745)
@@ -3,13 +3,14 @@
  2003/02/06: Thomas Bretz
 
-   * mbase/MLog.[h,cc]:
-     - serialized the GUI output (problems with mutithreded prgs, eg Cosy)
-
-   * mtemp/MObservatoryLocation.[h,cc], mtemp/MVPObject.[h,cc],
-     mtemp/MVPPlotter.[h,cc]:
-     - added changes discussed in Wuerzburg
-
-   * mfileio/MCT1ReadPreProc.cc:
-     - some simplifications
+    * mbase/MLog.[h,cc]:
+      - serialized the GUI output (problems with mutithreded prgs,
+        eg Cosy)
+
+    * mtemp/MObservatoryLocation.[h,cc], mtemp/MVPObject.[h,cc],
+      mtemp/MVPPlotter.[h,cc]:
+      - added changes discussed in Wuerzburg
+   
+    * mfileio/MCT1ReadPreProc.cc:
+      - some simplifications
 
 
@@ -22,10 +23,11 @@
         color of a given pixel 
 
-    * created two new classes for simulating the second level trigger in the 
-      directory manalysis:
-      - MTrigLvl2.[cc|h]         // Implement the Lvl2 topology and selection
-                                 // strategies
-      - MTrigLvl2FillTask.[cc|h] // For a given MMc event, fill the MTrigLvl2 
-                                    with the Lvl1 trigger information 
+    * created two new classes for simulating the second level trigger 
+      in the directory manalysis:
+      - MTrigLvl2.[cc|h]         // Implement the Lvl2 topology and
+                                 // selection strategies
+      - MTrigLvl2FillTask.[cc|h] // For a given MMc event, fill the
+                                 // MTrigLvl2 with the Lvl1 trigger 
+                                 // information 
 
     * manalysis/Makefile
@@ -38,11 +40,11 @@
  2003/01/27: Robert Wagner
 
-  * mfileio/MCT1ReadPreProc.[cc|h]
-    - Added call of MTaskList::ReInit after processing of new 
-      run header
-    - Filling of MC container complies to Oscar's changes of 
-      MMcEvt.[hxx,cxx] dated 2003/01/20
-    - Added filling of run number in MRawRunHeader object while
-      processing a new run header
+    * mfileio/MCT1ReadPreProc.[cc|h]
+      - Added call of MTaskList::ReInit after processing of new 
+        run header
+      - Filling of MC container complies to Oscar's changes of 
+        MMcEvt.[hxx,cxx] dated 2003/01/20
+      - Added filling of run number in MRawRunHeader object while
+        processing a new run header
 
 
@@ -50,7 +52,7 @@
  2003/01/23: Robert Wagner
 
-  * manalyis/MSigmabarCalc.cc
-    - MSigmabarCalc::Process()
-      Replaced fMcEvt->GetTheta() by fMcEvt->GetTelescopeTheta()
+    * manalyis/MSigmabarCalc.cc
+      - MSigmabarCalc::Process()
+        Replaced fMcEvt->GetTheta() by fMcEvt->GetTelescopeTheta()
 
 
@@ -58,38 +60,38 @@
  2003/01/20: Oscar Blanch
   
-  * mmc/MMcEvt.[hxx,cxx]
-    - Data members: fElecCphFraction, fMuonCphFraction, 
-      fOtherCphFraction have been introduced.
-    - Class version updated to 3.
-
-  * mmc/MMcCorsikaRunHeader.[h.cc]
-    - Data members: fWobbleMode and fAtmosphericModel introduced.
-    - Class version updated to 2.
+    * mmc/MMcEvt.[hxx,cxx]
+      - Data members: fElecCphFraction, fMuonCphFraction, 
+        fOtherCphFraction have been introduced.
+      - Class version updated to 3.
+
+    * mmc/MMcCorsikaRunHeader.[h.cc]
+      - Data members: fWobbleMode and fAtmosphericModel introduced.
+      - Class version updated to 2.
 
 
 
  2003/01/19: Thomas Bretz
- 
-   * manalysis/MCerPhotCalc.[h,cc]:
-     - slight changes, mainly to the layout
-   
-   * manalysis/MCerPhotEvt.[h,cc]:
-     - some small changes to make the code a bit faster
-
-   * manalysis/MCerPhotPix.[h,cc]:
-     - added AddNumPhotons
-     
-   * mbase/MContinue.[h,cc]:
-     - changed comments
-     - enhanced functionality and fixed some small bugs
-
-   * mbase/Makefile:
-     - added mfilter to paths (to be fixed)
-   
-   * mfileio/MCT1ReadPreProc.cc:
-     - Init fNumEvents = 0
-     
-   * mgeom/MGeomCam.cc:
-     - return 0 Ratio if the pixel number exceeds the number of pixels
+
+    * manalysis/MCerPhotCalc.[h,cc]:
+      - slight changes, mainly to the layout
+
+    * manalysis/MCerPhotEvt.[h,cc]:
+      - some small changes to make the code a bit faster
+
+    * manalysis/MCerPhotPix.[h,cc]:
+      - added AddNumPhotons
+
+    * mbase/MContinue.[h,cc]:
+      - changed comments
+      - enhanced functionality and fixed some small bugs
+
+    * mbase/Makefile:
+      - added mfilter to paths (to be fixed)
+
+    * mfileio/MCT1ReadPreProc.cc:
+      - Init fNumEvents = 0
+
+    * mgeom/MGeomCam.cc:
+      - return 0 Ratio if the pixel number exceeds the number of pixels
 
    * mgui/MCamDisplay.[h,cc]:
@@ -99,22 +101,22 @@
      - fixed the context menu display
    
-   * mhist/HistLinkDef.h, mhist/Makefile:
-     - added MHCerPhotEvt
-
-   * mhist/MHCerPhotEvt.[h,cc]:
-     - added
-     
-   * mhist/MFillH.cc:
-     - changed the initialization of fParContainer from pList to NULL
-   
-   * mhist/MHHillasExt.cc:
-     - fixed a smallo bug when filling the histograms (crached when scaling
-       under some circumstances)
-   
-   * mhist/MHStarMap.cc:
-     - added a warning output
-
-   * mmontecarlo/MMcCollectionAreaCalc.cc:
-     - added a check for impact=NaN (some MC Files have this)
+    * mhist/HistLinkDef.h, mhist/Makefile:
+      - added MHCerPhotEvt
+
+    * mhist/MHCerPhotEvt.[h,cc]:
+      - added
+     
+    * mhist/MFillH.cc:
+      - changed the initialization of fParContainer from pList to NULL
+   
+    * mhist/MHHillasExt.cc:
+      - fixed a smallo bug when filling the histograms (crached when scaling
+        under some circumstances)
+   
+    * mhist/MHStarMap.cc:
+      - added a warning output
+
+    * mmontecarlo/MMcCollectionAreaCalc.cc:
+      - added a check for impact=NaN (some MC Files have this)
 
 
@@ -163,13 +165,7 @@
       	otherwise, we got a compilation error in Alpha machines.
 
-<<<<<<< Changelog
-
-
- 2002/12/13: Oscar Blanch
-=======
 
 
  2002/12/13: Oscar blanch
->>>>>>> 1.369
 
     * mgeom/MGeomMirror.[h,cc]