Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7107)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7108)
@@ -21,4 +21,12 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/05/30 Thomas Bretz
+
+   * msql/MSQLServer.cc:
+     - added possibility to setup SelectDatabase from resource file
+
+
+
  2005/05/30 Daniela Dorner
 
@@ -48,5 +56,42 @@
 
 
- INPREP Markus Gaug (2005/05/21)
+ 2005/05/27 Javier Rico (2005/05/26)
+
+   * mbadpixels/MBadPixelsCam.cc
+     - fixed small bug in the Print() function (one line was printed out 
+       at a wrong place). (M. Gaug)
+
+
+
+ 2005/05/27 Javier Rico (2005/05/24)
+
+   * mhcalib/MHCalibrationHiLoCam.cc
+     - do not write Arrays if flag kOscillations is not set. 
+       (this was actually a bug since it caused a huge usage for large 
+       amounts of data). (M. Gaug)
+
+   * mcalib/MCalibColorSet.cc
+     - set colour already in the ReInit(), needed by the digital filter 
+       later. (M. Gaug)
+ 
+   * mjobs/MJCalibration.cc
+     - forgot to merge hi-lo calibration factors for intensity calibration.
+       (M. Gaug)
+
+   * mhcalib/MHCalibrationCam.[h,cc]
+     - do not Finalize histograms if a flag kReset is set. Caused wrong 
+       result in last run of intensity calibration. (M. Gaug)
+
+   * msignal/MC_calibration_weights_UV.dat
+     - Removed. It was confusing to have this file since it was just a 
+       copy of calibration_weights_UV.dat. For MC calibration you can 
+       just use the same weights files as for real data. (A. Moralejo)
+
+   * msignal/calibration_weights_blue46.dat
+     - added missing weights file (M. Gaug)
+
+
+
+ 2005/05/27 Markus Gaug (2005/05/21)
 
    * mcalib/MCalibrationChargePix.[h,cc]
@@ -56,4 +101,5 @@
      - implement usage of extractor resolution (only if UseExtractorRes
        is set).
+
 
 
@@ -109,4 +155,39 @@
      - added
 
+   * callisto_Dec04Jan05.rc:
+     - commented MJPedestalC1.ExtractSignal.FallTimeHiGain 
+       because it is the dfeault now
+
+   * msignal/MExtractTimeAndChargeSpline.cc:
+     - changed default of fgFallTimeHiGain to 0.5
+
+   * mimage/MHillasSrc.h:
+     - added copy constructor and Copy function
+
+   * msignal/MExtractTimeAndChargeDigitalFilter.[h,cc]:
+     - implemented reading of automatic weights file following an
+       idea of Markus G.
+
+   * mjobs/MJPedestal.cc:
+     - fixed the reading of the resource file fopr the extractor
+       (reading the extractor from file can overwrite the seetings)
+
+   * msignal/MC_weights46.dat:
+     - updated from BCN cvs
+
+   * msignal/Makefile:
+     - added -I../mcalib
+
+   * callisto.rc:
+     - updated comments
+
+   * mcalib/MCalibrateData.[h,cc]:
+     - same small changes to layout
+     - mainly unrolled Form-statements
+
+   * msignal/MExtractFixedWindow.cc:
+     - added case 12 and a default for logain setting the
+       extractor resolution (partly taken from bcn cvs)
+
 
 
@@ -124,4 +205,5 @@
    * mbase/MStatusDisplay.cc:
      - fixed a possible crash if padsave==NULL
+     - fixed the missing first tab in postscript files
 
    * mbase/MTask.cc:
Index: /trunk/MagicSoft/Mars/msql/MSQLServer.cc
===================================================================
--- /trunk/MagicSoft/Mars/msql/MSQLServer.cc	(revision 7107)
+++ /trunk/MagicSoft/Mars/msql/MSQLServer.cc	(revision 7108)
@@ -558,5 +558,5 @@
         pass = env.GetValue("Password", "");
     if (db.IsNull())
-        db = env.GetValue("Database", "");
+        db = env.GetValue("Database",   "");
 
     if (user.IsNull() && pass.IsNull())