Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 9023)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 9024)
@@ -80,4 +80,5 @@
      - unified output when finished
      - make sure the weight for the rate tab is not 0
+     - read the currents now from the camera instead of the currents tree
 
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 9023)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 9024)
@@ -10,4 +10,37 @@
      instead of the base name of the file. This makes them easier to 
      access from the code
+
+   * Default Monte Carlo names in MSequence do not require the _E at
+     the end anymore
+
+   * where abrrevating a sequence file with a sequence number is possible
+     also "telescope:sequence" is now accepted, e.g.:
+        star 2:2000123 --out=output
+     see the programs' help for more details.
+
+   * sequences (MSequence or MSequenceSQL) can now directly be retrieved
+     from the database. See the constructors for more details.
+
+ ;merpp
+
+   * we merpp the dc currents now also from the camera reports (they have
+     just a lower rate than the current reports, 0.1Hz instead of 1Hz)
+
+   * In the automatic analysis we omit merpping of the currents from the 
+     caco files and use the lower rate camera reports from the cc files
+     instead
+
+   * merpp has been redisigned to allow merpping of the cc-reports
+     of a whole sequence. This allows to design a very simple analysis:
+        mkdir output
+        ./callisto 100776 --out=output
+        ./merpp 100776 output
+        ./star 100776 --ind=output --out=output
+     Instead of the sequence number also sequence files are accepted.
+
+ ;star
+
+   * The camera currents are now displayed with the rate of the camera
+     reports instead of the caco reports
 
 
Index: /trunk/MagicSoft/Mars/callisto.cc
===================================================================
--- /trunk/MagicSoft/Mars/callisto.cc	(revision 9023)
+++ /trunk/MagicSoft/Mars/callisto.cc	(revision 9024)
@@ -44,5 +44,5 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << " callisto [-c] [-y] [options] sequence.txt|number" << endl << endl;
+    gLog << " callisto [-c] [-y] [options] sequence.txt|[tel:]number" << endl << endl;
     gLog << " Arguments:" << endl;
     gLog << "   sequence.txt:             ASCII file defining a sequence of runs" << endl;
Index: /trunk/MagicSoft/Mars/mjobs/MJStar.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 9023)
+++ /trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 9024)
@@ -192,5 +192,6 @@
     readreal.AddTree("Drive",            MReadReports::kRequired);
     readreal.AddTree("Starguider",       MReadReports::kRequired);
-    readreal.AddTree("Currents",         MReadReports::kRequired);
+    readreal.AddTree("Camera",           MReadReports::kRequired);
+    readreal.AddTree("Currents");
     readreal.AddTree("CC");
     readreal.AddTree("Rec");
@@ -461,9 +462,9 @@
     // Initialize histogram
     MHSectorVsTime histdc, histrms;
-    histdc.SetNameTime("MTimeCurrents");
+    histdc.SetNameTime("MTimeCamera");
     histdc.SetTitle("Average DC currents of all pixels vs time;;<I> [nA]");
     histdc.SetMinimum(0);
     histdc.SetMaximum(10);
-    histrms.SetNameTime("MTimeCurrents");
+    histrms.SetNameTime("MTimeCamera");
     histrms.SetTitle("Average pedestal rms of all pixels vs time;;<\\sigma_{p}> [phe]");
     histrms.SetType(5);
@@ -526,6 +527,6 @@
         tlist.AddToList(&fillp1,  "Drive");
         tlist.AddToList(&fillp2,  "Starguider");
-        tlist.AddToList(&fillrms, "Currents");
-        tlist.AddToList(&filldc,  "Currents");
+        tlist.AddToList(&fillrms, "Camera");
+        tlist.AddToList(&filldc,  "Camera");
         tlist.AddToList(&fillipr, "Trigger");
         tlist.AddToList(&filldt1, "CC");   // Old files: Receiver information in CC-Tree  (Mars<=2.0)
Index: /trunk/MagicSoft/Mars/star.cc
===================================================================
--- /trunk/MagicSoft/Mars/star.cc	(revision 9023)
+++ /trunk/MagicSoft/Mars/star.cc	(revision 9024)
@@ -41,5 +41,5 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << " star [options] sequence.txt|number" << endl << endl;
+    gLog << " star [options] sequence.txt|[tel:]number" << endl << endl;
     gLog << " Arguments:" << endl;
     gLog << "   sequence.txt:             Ascii file defining a sequence of runs" << endl;