Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6251)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6252)
@@ -21,8 +21,40 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/02/04 Thomas Bretz
+
+   * Makefile.rules:
+     - fixed creation of main MDep.d
+
+   * callisto.cc, merpp.cc, showlog.cc, showplot.cc, star.cc:
+     - added commandline option --version
+
+   * mbase/MFilter.cc:
+     - changed default for 'GetRule'
+
+   * mbase/MParContainer.cc:
+     - simplified GetNewObject
+
+   * mfbase/MF.cc:
+     - if no conditional sign is found try to create
+       MFilter-object
+
+   * mraw/MRawEvtData.cc:
+     - fixed the initialization of fABFlags in case maxid==0 which
+       is the default. This caused MRawEvtPixelIter::HasABFlag
+       to do unallowed access to memory for old root-files without
+       the AB flag, because it assumed (due to size==1) that the
+       data contains the ab flag
+
+   * mraw/MRawEvtPixelIter.[h,cc]:
+     - removed some obsolete debug comments
+     - simplified HasABFlag
+
+
+
  2005/02/04 Abelardo Moralejo
 
    * macros/starmc2.C
      - added to output missing container MConcentration.
+
 
 
@@ -65,4 +97,5 @@
    * mraw/MRawEvtHeader.h
      - introduced Setter() of cal. pattern for Abelardo
+
 
 
Index: trunk/MagicSoft/Mars/Makefile.rules
===================================================================
--- trunk/MagicSoft/Mars/Makefile.rules	(revision 6251)
+++ trunk/MagicSoft/Mars/Makefile.rules	(revision 6252)
@@ -25,5 +25,5 @@
 %.d:	
 	@echo " - Generating dependencies" $@
-	$(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) 2> /dev/null | \
+	$(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) -- $(PROGRAMS:=.cc) 2> /dev/null | \
          sed 's/^\(.*\).o:/$@ \1.o:/' > $@
 	echo "$@: Makefile" >> $@
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 6251)
+++ trunk/MagicSoft/Mars/NEWS	(revision 6252)
@@ -2,17 +2,18 @@
  *** Version <cvs>
    
-   - Kalibration is now done autmatically into equiv. photo-electrons like 
-     decided by the CB.
+   - Calibration is now done autmatically into equiv. photo-electrons like 
+     decided by the Collaboration Board
  
-   - Reference lines in the display can be read from conf. file
-
-   - Interlaced cal. events are now handled correctly by callisto. 
-
-   - High-Gain vs. Low-Gain calibration constants can be calculated (but not 
-     yet applied) in callisto.
+   - Reference lines in the display can be read from resource file
+
+   - Interlaced calibration events can be handled by callisto 
+
+   - High-Gain vs. Low-Gain calibration constants can be calculated
+     (but not yet applied) in callisto.
 
    - class MJCalibTest can be called by callisto
 
-   - interpolated pointing positions are now in Tree "Events" after calibration
+   - interpolated pointing positions are now in Tree "Events" after
+     calibration
 
    - callisto can now run with three data types: rawdata, rootdata, MC
@@ -21,9 +22,6 @@
      mreport/MReportStarguider.h for implementing starguider-data
      
-   - For implementing the starguider-data the class MReportStarguider has 
-     been added to mreport/ReportLinkDef.h and to mreport/Makefile
-     
-   - added two containers ( MReportStarguider, MTimeStarguider ) and
-     added MReportStarguider to the list in merpp.cc
+   - the output of merpp-update now contains starguider information:
+     MReportStarguider and MTimeStarguider
    
    - Fixed bug in MHHadronness.cc which made that the displayed Q-factor 
@@ -31,5 +29,5 @@
      energy (Size) events.
 
-   - Made MExtractTimeAndChargeDigital Filter the default for callisto
+   - Made MExtractTimeAndChargeDigitalFilter the default for callisto
 
    - added a new loop to callisto to support the correct extraction of 
@@ -46,5 +44,5 @@
      small pixels, example: extendcam.C
 
-   - added possibility to write data to memory (TTree) using MReadTree
+   - added possibility to write data to memory (TTree) using MWriteRootFile
 
    - added possibility to read a TTree stored only in memory by MReadTree
@@ -63,5 +61,5 @@
        with the signal extractor with randomization (extraction window is 
        randomly fixed)
-     The thir kind of pedestal is not yet implemented (for speed reasons) as
+     The three kind of pedestal is not yet implemented (for speed reasons) as
      long as nobody really needs it:
      + pedestal from extractor with randomizatiuon (MPedPhotFromExtractorRndm): 
@@ -76,4 +74,7 @@
       batch mode possible:
       showplot -b --save-as-ps[=outfile.ps] infile.root
+
+    - Allow class names as part of filter rules, eg
+      (MFSupercuts) && (MHillas.fSize>100)
 
 
Index: trunk/MagicSoft/Mars/callisto.cc
===================================================================
--- trunk/MagicSoft/Mars/callisto.cc	(revision 6251)
+++ trunk/MagicSoft/Mars/callisto.cc	(revision 6252)
@@ -59,5 +59,4 @@
     gLog << "   -q                        Quit when job is finished" << endl;
     gLog << "   -f                        Force overwrite of existing files" << endl;
-    //gLog << "   -ff                       Force execution if not all files found" << endl;
     gLog << "   --ind=path                Path where to search for the data files" << endl;
     gLog << "                             [default=standard path in datacenter]" << endl;
@@ -76,4 +75,5 @@
     gLog << "   --config=callisto.rc      Resource file [default=callisto.rc]" << endl;
     gLog << endl;
+    gLog << "   --version, -V             Show startup message with version number" << endl;
     gLog << "   -?, -h, --help            This help" << endl << endl;
     gLog << " Setup of the two jobs run by callisto (MJPedestal and MJCalibration)" << endl;
@@ -106,4 +106,7 @@
     MArgs arg(argc, argv, kTRUE);
 
+    if (arg.HasOnly("-V") || arg.HasOnly("--version"))
+        return 0;
+
     if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))
     {