Changeset 7001

Timestamp:

05/09/05 10:15:41 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• callisto.cc (modified) (3 diffs)
• ganymed.cc (modified) (3 diffs)
• mars.cc (modified) (4 diffs)
• mbase/MLog.cc (modified) (2 diffs)
• mbase/MLog.h (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (42 diffs)
• mbase/MStatusDisplay.h (modified) (8 diffs)
• merpp.cc (modified) (2 diffs)
• mfileio/MWriteRootFile.h (modified) (1 diff)
• mhflux/FluxLinkDef.h (modified) (1 diff)
• mhflux/MHTheta.cc (deleted)
• mhflux/MHTheta.h (deleted)
• mhflux/MHThetaSq.cc (added)
• mhflux/MHThetaSq.h (added)
• mhflux/Makefile (modified) (1 diff)
• mhist/MHCamera.cc (modified) (14 diffs)
• mhist/MHCamera.h (modified) (3 diffs)
• mhist/MHGamma.cc (deleted)
• mhist/MHGamma.h (deleted)
• mhist/MHOnSubtraction.cc (deleted)
• mhist/MHOnSubtraction.h (deleted)
• mjobs/MJCut.cc (modified) (3 diffs)
• mjobs/MJOptimize.cc (modified) (2 diffs)
• mjobs/MJSpectrum.cc (modified) (10 diffs)
• readdaq.cc (modified) (3 diffs)
• readraw.cc (modified) (3 diffs)
• showlog.cc (modified) (1 diff)
• showplot.cc (modified) (8 diffs)
• sinope.cc (modified) (3 diffs)
• sponde.cc (modified) (3 diffs)
• star.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/05/09 Thomas Bretz
+
+   * callisto.cc, ganymed.cc, mars.cc, merpp.cc, readdaq.cc,
+     readraw.cc, showplot.cc, sinope.cc, sponde.cc, star.cc:
+     - changed order of initialization such that a real NULL 
+       output is possible
+     - changed TApplication name from upper to lower case
+     - in some applications replaced manual setup of gLog with
+       gLog.Setup
+
+   * showlog.cc:
+     - improved alorithm
+
+   * showplot.cc:
+     - implemented Print options
+
+   * mbase/MLog.[h,cc]:
+     - fixed a bug which caused output in NULL output
+     - added Getter IsNullOutput
+
+   * mbase/MStatusDisplay.[h,cc]:
+     - implemented PDF and SVG printing
+     - moved "Save As Something" to new submenu
+     - fixed and improved printing
+     - implemented PrintDialog for printing
+     - implemented printing of log (untested)
+     - allow saving by extension (line Print() in root): SaveAs
+
+   * mfileio/MWriteRootFile.h:
+     - replaced BIT(17) by BIT(23) to improve compatibility with
+       root 4.04/00 and upcomming versions
+
+   * mhflux/Makefile, mjobs/MJCut.cc:
+     - replaced MTheta by MThetaSq to get rid of a problem
+       with the automatic naming of the binning (BinningTheta)
+
+   * mhist/MHCamera.[h,cc]:
+     - fixed a workaround (it has been fixed in root 4.04/00)
+     - allow setting the palette through the Draw-option. This allows
+       storage of the palette
+     - removed fColor. The palette is now diretly set though gStyle in
+       Paint
+
+   * mjobs/MJOptimize.cc:
+     - restore null output correctly after eventloop
+
+   * mjobs/MJSpectrum.cc:
+     - renamed Hist and HistOff to HistE and HistEOff
+     - added binnings M3Long and Conc1
+
+
 
  2005/05/06 Thomas Bretz

trunk/MagicSoft/Mars/NEWS

@@ -51 +51 @@
      this variable (one is already existing: MHTheta, which is now the
      default in ganymed). It is setup through ganymed.rc
+
+   - Improved support for printing in status display:
+     + A default can now be set in .rootrc (for more details see 
+       MStatusDisplay::PrintPS)
+     + A print dialog is opened so that printer and command line
+       can be canged
+
+   - improved showplot
+     + The new graphics formats have been implemented 
+       (pdf, svg, png, jpg and xpm)
+     + Implemented an interface for printing. Because you can change
+       the printing command from the command line you can use all
+       the nice postscript tool. To print a booklet for example call: 
+       showplot -b --print --print-cmd="cat %f" filename.root | lpr
+       showplot -b --print --print-cmd="psbook %f | psnup -2 | lpr" filename.root
+       showplot -b --null --print --print-cmd="psbook %f" filename.root > book.ps
+
+   - The storage of the palette in MHCamera is now possible
 
 

trunk/MagicSoft/Mars/callisto.cc

@@ -142 +142 @@
 int main(int argc, char **argv)
 {
+    //
+    // Evaluate arguments
+    //
+    MArgs arg(argc, argv, kTRUE);
+    gLog.Setup(arg);
+
     StartUpMessage();
-
-    //
-    // Evaluate arguments
-    //
-    MArgs arg(argc, argv, kTRUE);
 
     if (arg.HasOnly("-V") || arg.HasOnly("--version"))
@@ -157 +158 @@
         return 2;
     }
-
-    gLog.Setup(arg);
 
     const TString kConfig     = arg.GetStringAndRemove("--config=", "callisto.rc");
@@ -322 +321 @@
     MParContainer::Class()->IgnoreTObjectStreamer();
 
-    TApplication app("Callisto", &argc, argv);
+    TApplication app("callisto", &argc, argv);
     if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
     {

trunk/MagicSoft/Mars/ganymed.cc

@@ -89 +89 @@
 int main(int argc, char **argv)
 {
+    //
+    // Evaluate arguments
+    //
+    MArgs arg(argc, argv, kTRUE);
+    gLog.Setup(arg);
+
     StartUpMessage();
-
-    //
-    // Evaluate arguments
-    //
-    MArgs arg(argc, argv, kTRUE);
 
     if (arg.HasOnly("-V") || arg.HasOnly("--version"))
@@ -104 +105 @@
         return 2;
     }
-
-    gLog.Setup(arg);
 
     const TString kConfig       = arg.GetStringAndRemove("--config=", "ganymed.rc");
@@ -204 +203 @@
     MParContainer::Class()->IgnoreTObjectStreamer();
 
-    TApplication app("Ganymed", &argc, argv);
+    TApplication app("ganymed", &argc, argv);
     if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
     {

trunk/MagicSoft/Mars/mars.cc

@@ -69 +69 @@
     gLog << "Sorry the usage is:" << endl;
     gLog << "   mars [-h] [-?] [-a0] [-vn]" << endl << endl;
-    gLog << "     -a0: Do not use Ansii codes." << endl;
-    gLog << "     -vn: Verbosity level n [default=2]" << endl;
+    gLog.Usage();
     gLog << "     -?/-h: This help" << endl << endl;
 }
@@ -76 +75 @@
 int main(int argc, char **argv)
 {
-    StartUpMessage();
-
     //
     // Evaluate arguments
     //
-    MArgs arg(argc, argv);
+    MArgs arg(argc, argv, kTRUE);
+    gLog.Setup(arg);
+
+    StartUpMessage();
 
     if (arg.HasOption("-?") || arg.HasOption("-h"))
@@ -88 +88 @@
         return 2;
     }
-
-    //
-    // Set verbosity to highest level.
-    //
-    gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
-
-    if (arg.HasOption("-a") && arg.GetIntAndRemove("-a")==0)
-        gLog.SetNoColors();
 
 #ifdef HAVE_XPM
@@ -105 +97 @@
     // initialise ROOT
     //
-    TApplication app("Mars", &argc, argv);
+    TApplication app("mars", &argc, argv);
     if (gROOT->IsBatch() || !gClient)
     {

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -134 +134 @@
 #endif
 const char *const MLog::kBlue      = "\033[34m";
-const char *const MLog::kUnderline = "\033[4m";;
-const char *const MLog::kBlink     = "\033[5m";;
-const char *const MLog::kBright    = "\033[1m";;
-const char *const MLog::kDark      = "\033[2m";;
+const char *const MLog::kUnderline = "\033[4m";
+const char *const MLog::kBlink     = "\033[5m";
+const char *const MLog::kBright    = "\033[1m";
+const char *const MLog::kDark      = "\033[2m";
 
 //
@@ -488 +488 @@
     if (fDevice&eStdout)
     {
-        if (!TestBit(eNoColors))
+        if (!fIsNull && !TestBit(eNoColors))
             cout << kReset;
         cout.flush();

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -129 +129 @@
     void operator=(TGTextView *out)     { SetOutputGui(out);  }
 
+    Bool_t IsNullOutput() const { return fIsNull; }
     Bool_t IsOutputDeviceEnabled(int i) const { return fDevice & i; }
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -33 +33 @@
 // To write gif files of C-Macros use SaveAsGif()/SaveAsPNG() or SaveAsC().
 // Direct printing to the default printer (via lpr) can be done by
-// PrintToLpr().
+// PrintPS().
 //
 // It has also to half status lines which can be used to display the status
@@ -64 +64 @@
 
 #include <TH1.h>                  // TH1::AddDirectory
+#include <TPDF.h>                 // TPDF
+#include <TSVG.h>                 // TSVG
 #include <TEnv.h>                 // TEnv
 #include <TLine.h>                // TLine
@@ -74 +76 @@
 #include <TDatime.h>              // TDatime
 #include <TRandom.h>              // TRandom
+#include <TRegexp.h>              // TRegexp
 #include <TThread.h>              // TThread::Self()
 #include <TBrowser.h>             // TBrowser
@@ -80 +83 @@
 #include <TMethodCall.h>          // TMethodCall
 
-//#include <TRint.h>                // gApplication, TRint::Class()
 #include <TInterpreter.h>         // gInterpreter
 
@@ -92 +94 @@
 #include <TGFileDialog.h>         // TGFileDialog
 #include <TGProgressBar.h>        // TGHProgressBar
+#include <TGTextEditDialogs.h>    // TGPrintDialog
 #include <TRootEmbeddedCanvas.h>  // TRootEmbeddedCanvas
 
@@ -245 +248 @@
     //
     MGPopupMenu *filemenu = new MGPopupMenu(gClient->GetRoot());
-    // filemenu->AddEntry("Save &As...", kFileSaveAs);
-    filemenu->AddEntry("New Can&vas",   kFileCanvas);
-    filemenu->AddEntry("New &Browser",  kFileBrowser);
+    filemenu->AddEntry("New &Canvas",       kFileCanvas);
+    filemenu->AddEntry("New &Browser",      kFileBrowser);
     filemenu->AddSeparator();
-    filemenu->AddEntry("Save status.&ps",   kFileSaveAsPS);
-    filemenu->AddEntry("Save status.&png",  kFileSaveAsPNG);
-    filemenu->AddEntry("Save status.&gif",  kFileSaveAsGIF);
-    filemenu->AddEntry("Save status.&jpg",  kFileSaveAsJPG);
-    filemenu->AddEntry("Save status.&xpm",  kFileSaveAsXPM);
-    filemenu->AddEntry("Save status.&C",    kFileSaveAsC);
-    filemenu->AddEntry("Save status.&root", kFileSaveAsRoot);
+
+    const TString fname(MString::Form("Save %s.", gROOT->GetName()));
+    MGPopupMenu *savemenu = new MGPopupMenu(gClient->GetRoot());
+    savemenu->AddEntry(MString::Form("%s&ps",  fname.Data()),  kFileSaveAsPS);
+    savemenu->AddEntry(MString::Form("%sp&df", fname.Data()),  kFileSaveAsPDF);
+    savemenu->AddEntry(MString::Form("%s&svg", fname.Data()),  kFileSaveAsSVG);
+    savemenu->AddSeparator();
+    savemenu->AddEntry(MString::Form("%sp&ng", fname.Data()),  kFileSaveAsPNG);
+    savemenu->AddEntry(MString::Form("%s&gif", fname.Data()),  kFileSaveAsGIF);
+    savemenu->AddEntry(MString::Form("%s&jpg", fname.Data()),  kFileSaveAsJPG);
+    savemenu->AddEntry(MString::Form("%s&xpm", fname.Data()),  kFileSaveAsXPM);
+    //savemenu->AddEntry("Save status.x&cf",  kFileSaveAsXCF);
+    //savemenu->AddEntry("Save status.&tiff", kFileSaveAsTIFF);
+    //savemenu->AddEntry("Save status.&bmp",  kFileSaveAsBMP);
+    savemenu->AddSeparator();
+    savemenu->AddEntry(MString::Form("%s&C",    fname.Data()), kFileSaveAsC);
+    savemenu->AddEntry(MString::Form("%s&root", fname.Data()), kFileSaveAsRoot);
+    savemenu->Associate(this);
+
+    filemenu->AddEntry("&Open...",          kFileOpen);
+    filemenu->AddPopup("&Save", savemenu);
+    filemenu->AddEntry("Save &As...",       kFileSaveAs);
     filemenu->AddSeparator();
-    filemenu->AddEntry("&Open...",             kFileOpen);
-    filemenu->AddEntry("Save &As...",          kFileSaveAs);
+    filemenu->AddEntry("&Reset",            kFileReset);
     filemenu->AddSeparator();
-    filemenu->AddEntry("Re&set",               kFileReset);
+    filemenu->AddEntry("&Print",            kFilePrint);
     filemenu->AddSeparator();
-    filemenu->AddEntry("Print with &lpr",      kFilePrint);
-    //filemenu->AddEntry("Set printer &name",    kFilePrinterName);
-    filemenu->AddSeparator();
-    filemenu->AddEntry("C&lose", kFileClose);
-    filemenu->AddEntry("E&xit", kFileExit);
+    filemenu->AddEntry("C&lose",            kFileClose);
+    filemenu->AddEntry("E&xit",             kFileExit);
     filemenu->Associate(this);
 
@@ -273 +286 @@
     //
     MGPopupMenu *tabmenu = new MGPopupMenu(gClient->GetRoot());
-    tabmenu->AddEntry("Next [&+]",           kTabNext);
-    tabmenu->AddEntry("Previous [&-]",       kTabPrevious);
+    tabmenu->AddEntry("Next [&+]",          kTabNext);
+    tabmenu->AddEntry("Previous [&-]",      kTabPrevious);
     tabmenu->AddSeparator();
-    tabmenu->AddEntry("Save tab-i.&ps",   kTabSaveAsPS);
-    tabmenu->AddEntry("Save tab-i.&png",  kTabSaveAsPNG);
-    tabmenu->AddEntry("Save tab-i.&gif",  kTabSaveAsGIF);
-    tabmenu->AddEntry("Save tab-i.&jpg",  kTabSaveAsJPG);
-    tabmenu->AddEntry("Save tab-i.&xpm",  kTabSaveAsXPM);
-    tabmenu->AddEntry("Save tab-i.&C",    kTabSaveAsC);
-    tabmenu->AddEntry("Save tab-i.&root", kTabSaveAsRoot);
+
+    const TString fname2(MString::Form("Save %s-i.", gROOT->GetName()));
+    MGPopupMenu *savemenu2 = new MGPopupMenu(gClient->GetRoot());
+    savemenu2->AddEntry(MString::Form("%s&ps",  fname2.Data()),  kTabSaveAsPS);
+    savemenu2->AddEntry(MString::Form("%sp&df", fname2.Data()),  kTabSaveAsPDF);
+    savemenu2->AddEntry(MString::Form("%s&svg", fname2.Data()),  kTabSaveAsSVG);
+    savemenu2->AddSeparator();
+    savemenu2->AddEntry(MString::Form("%sp&ng", fname2.Data()),  kTabSaveAsPNG);
+    savemenu2->AddEntry(MString::Form("%s&gif", fname2.Data()),  kTabSaveAsGIF);
+    savemenu2->AddEntry(MString::Form("%s&jpg", fname2.Data()),  kTabSaveAsJPG);
+    savemenu2->AddEntry(MString::Form("%s&xpm", fname2.Data()),  kTabSaveAsXPM);
+    //savemenu->AddEntry("Save status.x&cf",  kFileSaveAsXCF);
+    //savemenu->AddEntry("Save status.&tiff", kFileSaveAsTIFF);
+    //savemenu->AddEntry("Save status.&bmp",  kFileSaveAsBMP);
+    savemenu2->AddSeparator();
+    savemenu2->AddEntry(MString::Form("%s&C",    fname2.Data()), kTabSaveAsC);
+    savemenu2->AddEntry(MString::Form("%s&root", fname2.Data()), kTabSaveAsRoot);
+    savemenu2->Associate(this);
+
+    tabmenu->AddPopup("&Save", savemenu2);
+    tabmenu->AddEntry("Save tab &As...",    kTabSaveAs);
     tabmenu->AddSeparator();
-    tabmenu->AddEntry("Save tab &As...",         kTabSaveAs);
+    tabmenu->AddEntry("&Remove",            kTabRemove);
     tabmenu->AddSeparator();
-    tabmenu->AddEntry("Re&move",             kTabRemove);
-    tabmenu->AddSeparator();
-    tabmenu->AddEntry("Print with &lpr",     kTabPrint);
+    tabmenu->AddEntry("&Print",             kTabPrint);
     tabmenu->Associate(this);
 
@@ -326 +351 @@
     logmenu->AddEntry("&Save",          kLogSave);
     logmenu->AddEntry("Save &append",   kLogAppend);
+    logmenu->AddSeparator();
+    logmenu->AddEntry("&Print",         kLogPrint);
     logmenu->Associate(this);
 
@@ -355 +382 @@
     // Add everything to autodel list
     //
+    fList->Add(savemenu);
+    fList->Add(savemenu2);
     fList->Add(filemenu);
     fList->Add(loopmenu);
@@ -1085 +1114 @@
 }
 
+TString MStatusDisplay::PrintDialog(TString &p, TString &c, TString &t, const char *ext)
+{
+    // If not in batch mode open a user dialog
+    if (!gROOT->IsBatch())
+    {
+        char *cprinter = StrDup(p);
+        char *ccmd     = StrDup(c);
+
+        Int_t rc=0;
+        new TGPrintDialog(fClient->GetRoot(), this, 400, 150, &cprinter, &ccmd, &rc);
+        if (rc)
+        {
+            p = cprinter; // default has been changed
+            c = ccmd;
+        }
+
+        delete [] cprinter;
+        delete [] ccmd;
+
+        if (!rc)
+            return "";
+    }
+
+
+    if (c.Contains("%f") && ext)
+    {
+        // Get temporary file name
+        TString name = "mars";
+
+        FILE *f = gSystem->TempFileName(name, t);
+        if (!f)
+        {
+            *fLog << warn << "MStatusDisplay::PrintDialog: Couldn't create temporary file in " << t << endl;
+            SetStatusLine2("failed!");
+            return "";
+        }
+        fclose(f);
+
+        // remove temp file
+        gSystem->Unlink(name);
+        name += ".";
+        name += ext;
+
+        t = name;
+    }
+
+    // compile command
+    TString cmd(c);
+
+    // if sprinter.IsNull we assume that everything around %p can
+    // be omitted and the program uses some kind of default
+    if (p.IsNull())
+    {
+        TString sub;
+        while (1)
+        {
+            sub = TString(cmd(TRegexp(" .*%p.* "))).Strip(TString::kBoth);
+            if (sub.IsNull())
+                break;
+
+            cmd.ReplaceAll(sub, "");
+        }
+    }
+
+    cmd.ReplaceAll("%p", p);
+    cmd.ReplaceAll("%f", t);
+
+    return cmd;
+}
+
 // --------------------------------------------------------------------------
 //
 // Saves the given canvas (pad) or all pads (num<0) as a temporary
-// postscript file and prints it using 'lpr'. If a printer name is set
-// via SetPrinter 'lpr -Pname' is used.
-//
-Int_t MStatusDisplay::PrintToLpr(Int_t num)
-{
-    TString name = "mars";
-
-    for (int i=0; i<6; i++)
-        name += (char)(gRandom->Uniform(25)+65);
-
-    name += ".ps";
-
-    const Int_t pages = SaveAsPS(num, name);
-
+// postscript file and prints it.
+//
+// The default command line c is: lpr -P%p %f
+//   %p: printer name
+//   %f: temporary file name
+//
+// The default printer name p is: <empty>
+//
+// Both can be changed in .rootrc by:
+//   PrintPS.Printer
+//   PrintPS.Command
+//
+// Ant the location of the temporary file t can by changed by
+//   Print.Directory
+// the default is the system default directory (normally /tmp)
+//
+Int_t MStatusDisplay::PrintPS(Int_t num, const char *p, const char *c, const char *t)
+{
+    static TString sprinter = gEnv->GetValue("PrintPS.Printer", p&&*p?p:"");
+    static TString scmd     = gEnv->GetValue("PrintPS.Command", c&&*c?c:"lpr -P%p %f");
+
+    TString tmp = gEnv->GetValue("Print.Directory", t&&*t?t:gSystem->TempDirectory());
+
+    TString cmd = PrintDialog(sprinter, scmd, tmp, "ps");
+    if (cmd.IsNull())
+        return 0;
+
+    // set status lines
     SetStatusLine1("Printing...");
     SetStatusLine2("");
 
+    // print to temporary file
+    const Int_t pages = SaveAsPS(num, tmp);
+
+    // check
     if (!pages)
     {
-        *fLog << warn << "MStatusDisplay::PrintToLpr: Sorry, couldn't save file as temporary postscript!" << endl;
+        *fLog << warn << "MStatusDisplay::Print: Sorry, couldn't save file as temporary postscript!" << endl;
         SetStatusLine2("Failed!");
         return 0;
     }
 
-    TString cmd="lpr ";
-    if (!fPrinter.IsNull())
-    {
-        cmd += "-P";
-        cmd += fPrinter;
-        cmd += " ";
-    }
-    cmd += name;
-
+    // execute command
+    *fLog << dbg << "Executing: " << cmd << endl;
     gSystem->Exec(cmd);
-    gSystem->Unlink(name);
+
+    // remove temporary file
+    gSystem->Unlink(tmp);
 
     SetStatusLine2(MString::Form("Done (%dpage(s))", pages));
@@ -1226 +1338 @@
 }
 
+Bool_t MStatusDisplay::SaveLogAsPS(const char *n) const
+{
+    TString name(n);
+    AddExtension(name, "ps");
+
+    // Code taken from TGTextEdit::Print
+    const TString pipe = MString::Form("a2ps -o%s", name.Data());
+    FILE *p = gSystem->OpenPipe(pipe, "w");
+    if (!p)
+    {
+        *fLog << err << "ERROR - Couldn't open pipe " << pipe << endl;
+        return kFALSE;
+    }
+
+    TGText *text = fLogBox->GetText();
+
+    char   *buf1, *buf2;
+    Long_t  len;
+    ULong_t i = 0;
+    TGLongPosition pos;
+
+    pos.fX = pos.fY = 0;
+    while (pos.fY < text->RowCount())
+    {
+        len = text->GetLineLength(pos.fY);
+        buf1 = text->GetLine(pos, len);
+        buf2 = new char[len + 2];
+        strncpy(buf2, buf1, (UInt_t)len);
+        buf2[len]   = '\n';
+        buf2[len+1] = '\0';
+        while (buf2[i] != '\0') {
+            if (buf2[i] == '\t') {
+                ULong_t j = i+1;
+                while (buf2[j] == 16 && buf2[j] != '\0')
+                    j++;
+                strcpy(buf2+i+1, buf2+j);
+            }
+            i++;
+        }
+        fwrite(buf2, sizeof(char), strlen(buf2)+1, p);
+
+        delete [] buf1;
+        delete [] buf2;
+        pos.fY++;
+    }
+    gSystem->ClosePipe(p);
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Print the log text.
+//
+// The default command line c is: a2ps -P%p
+//   %p: printer name
+//
+// The default printer name p is: <empty>
+//
+// Both can be changed in .rootrc by:
+//   PrintText.Printer
+//   PrintText.Command
+//
+Bool_t MStatusDisplay::PrintLog(const char *p, const char *c)
+{
+    static TString sprinter = gEnv->GetValue("PrintText.Printer", p&&*p?p:"");
+    static TString scmd     = gEnv->GetValue("PrintText.Command", c&&*c?c:"a2ps -P%p");
+
+    TString tmp;
+    TString cmd = PrintDialog(sprinter, scmd, tmp);
+    if (cmd.IsNull())
+        return kFALSE;
+
+    // set status lines
+    SetStatusLine1("Printing...");
+    SetStatusLine2("");
+
+    // print to temporary file
+    if (!SaveLogAsPS(cmd))
+    {
+        *fLog << warn << "MStatusDisplay::PrintLog: Sorry, couldn't create postscript!" << endl;
+        SetStatusLine2("Failed!");
+        return kFALSE;
+    }
+
+    // execute command
+    *fLog << dbg << "Executing: " << cmd << endl;
+    gSystem->Exec(cmd);
+
+    SetStatusLine2("Done.");
+
+    return kTRUE;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -1267 +1472 @@
         return kTRUE;
 
+    case kFileSaveAsPDF:
+        SaveAsPDF();
+        return kTRUE;
+
+    case kFileSaveAsSVG:
+        SaveAsSVG();
+        return kTRUE;
+
     case kFileSaveAsPNG:
         SaveAsPNG();
@@ -1283 +1496 @@
         return kTRUE;
 
+    //case kFileSaveAsXCF:
+    //    SaveAsXCF();
+    //    return kTRUE;
+
+    //case kFileSaveAsTIFF:
+    //    SaveAsTIFF();
+    //    return kTRUE;
+
+    //case kFileSaveAsBMP:
+    //    SaveAsBMP();
+    //    return kTRUE;
+
     case kFileSaveAsC:
         SaveAsC();
@@ -1292 +1517 @@
 
     case kFilePrint:
-        PrintToLpr();
+        PrintPS();
         return kTRUE;
 
@@ -1303 +1528 @@
         return kTRUE;
 
+    case kTabSaveAsPDF:
+        SaveAsPDF(fTab->GetCurrent());
+        return kTRUE;
+
+    case kTabSaveAsSVG:
+        SaveAsSVG(fTab->GetCurrent());
+        return kTRUE;
+
     case kTabSaveAsPNG:
         SaveAsPNG(fTab->GetCurrent());
@@ -1319 +1552 @@
         return kTRUE;
 
+    //case kTabSaveAsXCF:
+    //    SaveAsXCF(fTab->GetCurrent());
+    //    return kTRUE;
+
+    //case kTabSaveAsBMP:
+    //    SaveAsBMP(fTab->GetCurrent());
+    //    return kTRUE;
+
+    //case kTabSaveAsTIFF:
+    //    SaveAsTIFF(fTab->GetCurrent());
+    //    return kTRUE;
+
     case kTabSaveAsC:
         SaveAsC(fTab->GetCurrent());
@@ -1328 +1573 @@
 
     case kTabPrint:
-        PrintToLpr(fTab->GetCurrent());
+        PrintPS(fTab->GetCurrent());
         return kTRUE;
 
@@ -1386 +1631 @@
         SetStatusLine2("");
         *fLog << inf << "Saving log... " << flush;
-        if (fLogBox->GetText()->Save("statusdisplay.log"))
+        if (fLogBox->GetText()->Save(MString::Form("%s.log", gROOT->GetName())))
         {
             *fLog << "done." << endl;
@@ -1402 +1647 @@
         SetStatusLine2("");
         *fLog << inf << "Appending log... " << flush;
-        if (fLogBox->GetText()->Append("statusdisplay.log"))
+        if (fLogBox->GetText()->Append(MString::Form("%s.log", gROOT->GetName())))
         {
             *fLog << "done." << endl;
@@ -1412 +1657 @@
             SetStatusLine2("Failed!");
         }
+        return kTRUE;
+
+    case kLogPrint:
+        PrintLog();
         return kTRUE;
 #ifdef DEBUG
@@ -1973 +2222 @@
     if (name.IsNull())
     {
-        name = "status";
+        name = gROOT->GetName();
         if (num>0)
         {
@@ -2042 +2291 @@
     gSystem->Unlink(name);
     gSystem->Rename(name+".$$$", name);
-/*
-    //
-    // Old style algorithm. Shifts blocks inside a single file --- SLOW!
-    //
-    const Int_t l = newstr.Length();
-
-    Long_t t[4]; // { id, size, flags, modtime }
-    gSystem->GetPathInfo(name, t, t+1, t+2, t+3);
-
-    char *c[2] = { new char[l], new char[l] };
-
-    fstream f(name, ios::in|ios::out);
-
-    TString str;
-    f >> str >> c[0][0];     // Read "%!PS-Adobe-2.0\n" (Mini Header)
-    f.read(c[0], l);
-    f.seekp(-l, ios::cur);
-    f.write(newstr, l);
-
-    int i=0;
-    while (1)
-    {
-        f.read(c[(i+1)%2], l);
-        f.seekp(-l, ios::cur);
-
-        if (f)
-        {
-            f.write(c[i%2],l);
-            i++;
-            i%=2;
-            continue;
-        }
-
-        const Int_t ssz   = str.Length()+1;        // Length of Mini-Header
-        const Int_t block = t[1]-ssz;              // Length of block to be shifted
-        const Int_t size  = block%l;               // Reminder
-        const Int_t pos   = (block/l)*l + ssz + 1; // Position to start writing
-
-        f.clear();
-        f.seekp(pos);
-        f.write(c[i%2], l);
-        f.write(c[(i+1)%2], size);
-        break;
-    }
-
-    delete c[1];
-    delete c[0];
-*/
-}
-
-// --------------------------------------------------------------------------
-//
-// In case of num<0 all tabs are written into the PS file. If num>0
+}
+
+void MStatusDisplay::PSToolsRange(TVirtualPS &vps, Float_t psw, Float_t psh) const
+{
+    if (vps.InheritsFrom(TPostScript::Class()))
+        static_cast<TPostScript&>(vps).Range(psw, psh);
+    // if (vps.InheritsFrom(TPDF::Class()))
+    //     static_cast<TPDF&>(vps).Range(psw/2, psh/2);
+    // if (vps.InheritsFrom(TSVG::Class()))
+    //     static_cast<TSVG&>(vps).Range(psw, psh);
+}
+
+void MStatusDisplay::PSToolsTextNDC(TVirtualPS &vps, Double_t u, Double_t v, const char *string) const
+{
+    if (vps.InheritsFrom(TPostScript::Class()))
+        static_cast<TPostScript&>(vps).TextNDC(u, v, string);
+    // if (vps.InheritsFrom(TPDF::Class()))
+    //    static_cast<TPDF&>(vps).TextNDC(u, v, string);
+    // if (vps.InheritsFrom(TSVG::Class()))
+    //    static_cast<TSVG&>(vps).TextNDC(u, v, string);
+}
+
+// --------------------------------------------------------------------------
+//
+// Write some VGF (vector graphics format). Currently PS, PDF and SVG
+// is available. Specified by ext.
+//
+// In case of num<0 all tabs are written into the VGF file. If num>0
 // the canvas in the corresponding tab is written to the file.
 // Name is the name of the file (with or without extension).
@@ -2100 +2324 @@
 // Returns the number of pages written.
 //
-// To write all tabs you can also use SaveAsPS(name)
+// To write all tabs you can also use SaveAsVGF(name, ext)
 //
 // If the third argument is given a bottom line is drawn with the text
@@ -2106 +2330 @@
 // fTitle (SetTitle) is not empty.
 //
-Int_t MStatusDisplay::SaveAsPS(Int_t num, TString name, const TString addon)
-{
-    SetStatusLine1("Writing Postscript file...");
+Int_t MStatusDisplay::SaveAsVGF(Int_t num, TString name, const TString addon, const TString ext)
+{
+    SetStatusLine1(Form("Writing %s file...",ext.Data()));
     SetStatusLine2("");
 
@@ -2117 +2341 @@
     }
 
-    AddExtension(name, "ps", num);
+    AddExtension(name, ext, num);
 
     if (num<0)
-        *fLog << inf << "Open ps-File: " << name << endl;
+        *fLog << inf << "Open " << ext << "-File: " << name << endl;
 
     TPad       *padsav = (TPad*)gPad;
@@ -2127 +2351 @@
     TDatime d;
 
-    TPostScript ps(name, 112);
-    ps.SetBit(TPad::kPrintingPS);
-    ps.PrintFast(13, "/nan {1} def ");
-
-    gVirtualPS = &ps;
+    Int_t type = -1;
+
+    TVirtualPS *ps =0;
+    if (!ext.CompareTo("ps", TString::kIgnoreCase))
+    {
+        ps = new TPostScript(name, 112);
+        type = 1;
+    }
+    if (!ext.CompareTo("pdf", TString::kIgnoreCase))
+    {
+        ps = new TPDF(name, 112);
+        type = 2;
+    }
+    if (!ext.CompareTo("svg", TString::kIgnoreCase))
+    {
+        ps = new TSVG(name, 112);
+        type = 3;
+    }
+
+    if (!ps)
+    {
+        *fLog << err << "Extension " << ext << " unknown..." << endl;
+        SetStatusLine2("Failed!");
+        return 0;
+    }
+
+    ps->SetBit(TPad::kPrintingPS);
+    if (type==1)
+        ps->PrintFast(13, "/nan {1} def ");
+
+    gVirtualPS = ps;
 
     //
@@ -2170 +2420 @@
         // has the same Aspect Ratio than on the screen.
         //
-        ps.NewPage();
+        if (i>from)
+            ps->NewPage();
 
         //
@@ -2176 +2427 @@
         // such that the page title can be set above the canvas...
         //
-        Float_t psw = 28.0; // A4 - width (29.7)
+        Float_t psw = 28.0; // A4 - width  (29.7)
         Float_t psh = 21.0; // A4 - height (21.0)
 
@@ -2187 +2438 @@
             psh = ch/cw*psw;
 
-        ps.Range(psw, psh); // A4
+        PSToolsRange(*ps, psw, psh);
 
         //
@@ -2219 +2470 @@
         // Print overlaying text (NDC = %)
         //
-        ps.SetTextColor(kBlack);
-        ps.SetTextSize(0.015);
-        ps.SetTextFont(22);
-        ps.SetTextAlign(11); // left top
-        ps.TextNDC(0, 1.015, TString("  ")+n->GetName());
-        ps.SetTextAlign(21); // cent top
-        ps.TextNDC(0.5, 1.015, TString("MARS - Magic Analysis and Reconstruction Software - ")+d.AsString());
-        ps.SetTextAlign(31); // right top
-        ps.TextNDC(1, 1.015, MString::Form("Page No.%i (%i)  ", page++, i));
+        ps->SetTextColor(kBlack);
+        ps->SetTextSize(0.015);
+        ps->SetTextFont(22);
+        ps->SetTextAlign(11); // left top
+        PSToolsTextNDC(*ps, 0, 1.015, TString("  ")+n->GetName());
+        ps->SetTextAlign(21); // cent top
+        PSToolsTextNDC(*ps, 0.5, 1.015, TString("MARS - Magic Analysis and Reconstruction Software - ")+d.AsString());
+        ps->SetTextAlign(31); // right top
+        PSToolsTextNDC(*ps, 1, 1.015, MString::Form("Page No.%i (%i)  ", page++, i));
         line.PaintLineNDC(0, 1.01, 1, 1.01);
 
@@ -2234 +2485 @@
         {
             line.PaintLineNDC(0, -0.00, 1, -0.00);
-            ps.SetTextAlign(11); // left top
-            ps.TextNDC(0, -0.015, TString("  ")+txt);
-            ps.SetTextAlign(31); // right top
-            ps.TextNDC(1, -0.015, "(c) 2000-2004, Thomas Bretz  ");
+            ps->SetTextAlign(11); // left top
+            PSToolsTextNDC(*ps, 0, -0.015, TString("  ")+txt);
+            ps->SetTextAlign(31); // right top
+            PSToolsTextNDC(*ps, 1, -0.015, "(c) 2000-2005, Thomas Bretz  ");
         }
 
@@ -2250 +2501 @@
     l.Delete();
 
-    ps.Close();
-
-    SetStatusLine2("Updating header of PS file...");
-
-    if (num<0)
-        *fLog << " - Updating header of PS file... " << flush;
-    UpdatePSHeader(name);
-    if (num<0)
-        *fLog << inf << "done." << endl;
+    ps->Close();
+    delete ps;
+
+    if (type==1)
+    {
+        SetStatusLine2("Updating header of PS file...");
+
+        if (num<0)
+            *fLog << " - Updating header of PS file... " << flush;
+        UpdatePSHeader(name);
+        if (num<0)
+            *fLog << inf << "done." << endl;
+    }
 
     gVirtualPS = psave;
@@ -2274 +2529 @@
 Bool_t MStatusDisplay::SaveAsImage(Int_t num, TString name, TImage::EImageFileTypes type)
 {
+//#if ROOT_VERSION_CODE < ROOT_VERSION(4,04,00)
     if (gROOT->IsBatch())
     {
@@ -2280 +2536 @@
         return 0;
     }
-    //SetStatusLine1("Writing GIF file...");
+//#endif
+
     SetStatusLine1("Writing image file... <please be patient>");
     SetStatusLine2("");
@@ -2306 +2563 @@
         ext = AddExtension(name, "jpg", num);
         break;
-//    case TImage::kXcf:
-//        ext = AddExtension(name, "xcf", num);
+    case TImage::kGif:
+        ext = AddExtension(name, "gif", num);
+        break;
+//    case TImage::kTiff:
+//        ext = AddExtension(name, "tiff", num);
 //        break;
 //    case TImage::kPpm:
@@ -2315 +2575 @@
 //        ext = AddExtension(name, "pnm", num);
 //        break;
-//    case TImage::kBmp:
-//        ext = AddExtension(name, "bmp", num);
-//        break;
 //    case TImage::kIco:
 //        ext = AddExtension(name, "ico", num);
@@ -2324 +2581 @@
 //        ext = AddExtension(name, "cur", num);
 //        break;
-    case TImage::kGif:
-        ext = AddExtension(name, "gif", num);
-        break;
-//    case TImage::kTiff:
-//        ext = AddExtension(name, "tif", num);
+//    case TImage::kBmp:
+//        ext = AddExtension(name, "bmp", num);
+//        break;
+//    case TImage::kXcf:
+//        ext = AddExtension(name, "xcf", num);
 //        break;
 //    case TImage::kXbm:
@@ -2397 +2654 @@
         *fLog << "..." << flush;
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(4,04,00)
         c->Draw();
+
         if (type==TImage::kGif)
             c->SaveAs(writename); // FIXME: Seems not to work well in TImage! (root 3.10/02)
@@ -2407 +2666 @@
             delete img;
         }
-
+#else
+        c->Print(writename);
+#endif
         if (num<0)
             *fLog << "done." << endl;
@@ -2535 +2796 @@
 // --------------------------------------------------------------------------
 //
+// Determin File type to save file as by extension. Allowed extensions are:
+//   root, ps, pdf, svg, gif, png, jpg, xpm, C
+//
+// returns -1 if file type is unknown. Otherwise return value of SaveAs*
+//
+Int_t MStatusDisplay::SaveAs(Int_t num, TString name)
+{
+    if (name.EndsWith(".root")) return SaveAsRoot(num, name);
+    if (name.EndsWith(".ps"))   return SaveAsPS(num, name);
+    if (name.EndsWith(".pdf"))  return SaveAsPDF(num, name);
+    if (name.EndsWith(".svg"))  return SaveAsSVG(num, name);
+    if (name.EndsWith(".gif"))  return SaveAsGIF(num, name);
+    if (name.EndsWith(".png"))  return SaveAsPNG(num, name);
+    if (name.EndsWith(".jpg"))  return SaveAsJPG(num, name);
+    if (name.EndsWith(".xpm"))  return SaveAsXPM(num, name);
+    if (name.EndsWith(".C"))    return SaveAsC(num, name);
+    return -1;
+}
+
+// --------------------------------------------------------------------------
+//
 //  Opens a save as dialog
 //
@@ -2542 +2824 @@
     {
         "PostScript",   "*.ps",
+        "Acrobat pdf",  "*.pdf",
+        "SVG vector",   "*.svg",
         "Gif files",    "*.gif",
+        "Png files",    "*.png",
+        "Gif files",    "*.gif",
+        "Jpeg files",   "*.jpeg",
+        "Xpm files",    "*.xpm",
         "Macro files",  "*.C",
         "ROOT files",   "*.root",
@@ -2563 +2851 @@
     dir = fi.fIniDir;
 
-    const TString name(fi.fFilename);
-
-    if (name.EndsWith(".root")) return SaveAsRoot(num, name);
-    if (name.EndsWith(".ps"))   return SaveAsPS(num, name);
-    if (name.EndsWith(".gif"))  return SaveAsGIF(num, name);
-    if (name.EndsWith(".C"))    return SaveAsC(num, name);
+    const Int_t rc = SaveAs(num, fi.fFilename);
+    if (rc>=0)
+        return rc;
 
     Warning("MStatusDisplay::SaveAs", "Unknown Extension: %s", fi.fFilename);

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -26 +26 @@
 class TMutex;
 class TCanvas;
+class TVirtualPS;
 
 class TGTab;
@@ -42 +43 @@
     typedef enum {
         // kFile
-        kFileBrowser, kFileCanvas, kFileOpen, kFileSave, kFileSaveAs, kFileSaveAsPS,
-        kFileSaveAsRoot, kFileSaveAsPNG, kFileSaveAsGIF, kFileSaveAsJPG,
-        kFileSaveAsXPM, kFileSaveAsC, kFilePrint, kFilePrinterName,
+        kFileBrowser, kFileCanvas, kFileOpen, kFileSave, kFileSaveAs,
+        kFileSaveAsPS, kFileSaveAsPDF, kFileSaveAsSVG, kFileSaveAsRoot,
+        kFileSaveAsPNG, kFileSaveAsGIF, kFileSaveAsJPG, kFileSaveAsXPM,
+        /*kFileSaveAsBMP, kFileSaveAsXCF, kFileSaveAsTIFF,*/
+        kFileSaveAsC, kFilePrint, kFilePrinterName,
         kFileClose, kFileExit, kFileReset,
         // kLoop
         kLoopNone, kLoopStop,
         // kTab
-        kTabSave, kTabSaveAs, kTabSaveAsPS, kTabSaveAsRoot, kTabSaveAsPNG,
-        kTabSaveAsGIF, kTabSaveAsJPG, kTabSaveAsXPM, kTabSaveAsC,
+        kTabSave, kTabSaveAs, kTabSaveAsPS, kTabSaveAsPDF, kTabSaveAsSVG,
+        kTabSaveAsRoot, kTabSaveAsPNG, kTabSaveAsGIF, kTabSaveAsJPG,
+        kTabSaveAsXPM, /*kTabSaveAsBMP, kTabSaveAsXCF, kTabSaveAsTIFF,*/
+        kTabSaveAsC,
         kTabPrint, kTabNext, kTabPrevious, kTabRemove,
         // kSize
@@ -57 +62 @@
         // kLog
         kLogCopy, kLogClear, kLogSelect, kLogFind, kLogSave, kLogAppend,
+        kLogPrint,
         // kPic
         kPicMagic, kPicMars,
@@ -91 +97 @@
 
     Status_t fStatus;
-
-    TString fPrinter;
 
     Int_t fLogIdx;
@@ -134 +138 @@
     Bool_t Display(const TObjArray &list, const char *tab=0);
 
-    const TString &AddExtension(TString &name, const TString &ext, Int_t num) const;
+    const TString &AddExtension(TString &name, const TString &ext, Int_t num=-1) const;
 
     void UpdatePSHeader(const TString &name) const;
@@ -144 +148 @@
 
     Bool_t SaveAsImage(Int_t num, TString name, TImage::EImageFileTypes type);
+    Int_t  SaveAsVGF(Int_t num, TString name, const TString addon, const TString ext);
+
+    void PSToolsRange(TVirtualPS &vps, Float_t w, Float_t h) const;
+    void PSToolsTextNDC(TVirtualPS &vps, Double_t u, Double_t v, const char *string) const;
+    TString PrintDialog(TString &p, TString &c, TString &t, const char *ext=0);
+
 
 public:
@@ -161 +171 @@
      void SetStatusLine2(const char *txt) { SetStatusLine(txt, 1); }
      void SetStatusLine2(const MParContainer &cont);
-
-     void SetPrinter(const TString &lpr) { fPrinter = lpr; }
 
      virtual void SetName(const char *name) { fName = name; }
@@ -198 +206 @@
      void SetNoContextMenu(Bool_t flag=kTRUE);
 
-     Int_t  SaveAsPS(TString name="", const TString addon="") { return SaveAsPS(-1, name, addon); }
-     Bool_t SaveAsPNG(TString name="") { return SaveAsPNG(-1, name); }
-     Bool_t SaveAsGIF(TString name="") { return SaveAsGIF(-1, name); }
-     Bool_t SaveAsXPM(TString name="") { return SaveAsXPM(-1, name); }
-     Bool_t SaveAsJPG(TString name="") { return SaveAsJPG(-1, name); }
-     Bool_t SaveAsC(TString name="") { return SaveAsC(-1, name); }
+     Int_t  SaveAsPS(TString name="",  const TString addon="") { return SaveAsVGF(-1, name, addon, "ps"); }
+     Int_t  SaveAsPDF(TString name="", const TString addon="") { return SaveAsVGF(-1, name, addon, "pdf"); }
+     Int_t  SaveAsSVG(TString name="", const TString addon="") { return SaveAsVGF(-1, name, addon, "svg"); }
+     Bool_t SaveAsPNG(TString name="")  { return SaveAsPNG(-1, name); }
+     Bool_t SaveAsGIF(TString name="")  { return SaveAsGIF(-1, name); }
+     Bool_t SaveAsXPM(TString name="")  { return SaveAsXPM(-1, name); }
+     Bool_t SaveAsJPG(TString name="")  { return SaveAsJPG(-1, name); }
+     //Bool_t SaveAsTIFF(TString name="") { return SaveAsTIFF(-1, name); }
+     //Bool_t SaveAsXCF(TString name="")  { return SaveAsXCF(-1, name); }
+     //Bool_t SaveAsBMP(TString name="")  { return SaveAsBMP(-1, name); }
+     Bool_t SaveAsC(TString name="")    { return SaveAsC(-1, name); }
      Int_t  SaveAsRoot(TString name="") { return SaveAsRoot(-1, name); }
-     Int_t  PrintToLpr() { return PrintToLpr(-1); }
-
-     Int_t  SaveAsPS(Int_t num, TString name="", const TString addon="");
-     Bool_t SaveAsPNG(Int_t num, TString name="") { return SaveAsImage(num, name, TImage::kPng); }
-     Bool_t SaveAsGIF(Int_t num, TString name="") { return SaveAsImage(num, name, TImage::kGif); }
-     Bool_t SaveAsXPM(Int_t num, TString name="") { return SaveAsImage(num, name, TImage::kXpm); }
-     Bool_t SaveAsJPG(Int_t num, TString name="") { return SaveAsImage(num, name, TImage::kJpeg); }
+     Int_t  SaveAs(TString name)        { return SaveAs(-1, name); }
+     Int_t  PrintPS() { return PrintPS(-1); }
+
+     Int_t  SaveAsPS(Int_t num, TString name="",  const TString addon="") { return SaveAsVGF(num, name, addon, "ps"); }
+     Int_t  SaveAsPDF(Int_t num, TString name="", const TString addon="") { return SaveAsVGF(num, name, addon, "pdf"); }
+     Int_t  SaveAsSVG(Int_t num, TString name="", const TString addon="") { return SaveAsVGF(num, name, addon, "svg"); }
+     Bool_t SaveAsPNG(Int_t num, TString name="")  { return SaveAsImage(num, name, TImage::kPng); }
+     Bool_t SaveAsGIF(Int_t num, TString name="")  { return SaveAsImage(num, name, TImage::kGif); }
+     Bool_t SaveAsXPM(Int_t num, TString name="")  { return SaveAsImage(num, name, TImage::kXpm); }
+     Bool_t SaveAsJPG(Int_t num, TString name="")  { return SaveAsImage(num, name, TImage::kJpeg); }
+     //Bool_t SaveAsTIFF(Int_t num, TString name="") { return SaveAsImage(num, name, TImage::kTiff); }
+     //Bool_t SaveAsXCF(Int_t num, TString name="")  { return SaveAsImage(num, name, TImage::kXcf); }
+     //Bool_t SaveAsBMP(Int_t num, TString name="")  { return SaveAsImage(num, name, TImage::kBmp); }
      Bool_t SaveAsC(Int_t num, TString name="");
      Int_t  SaveAsRoot(Int_t num, TString name="");
-     Int_t  PrintToLpr(Int_t num);
+     Int_t  SaveAs(Int_t num, TString name);
+     Int_t  PrintPS(Int_t num, const char *p=0, const char *cmd=0, const char *tmp=0);
+     Bool_t PrintLog(const char *p=0, const char *c=0);
+     Bool_t SaveLogAsPS(const char *name) const;
 
      Int_t  SaveAs(Int_t num=-1);

trunk/MagicSoft/Mars/merpp.cc

@@ -145 +145 @@
 int main(const int argc, char **argv)
 {
+    //
+    // Evaluate arguments
+    //
+    MArgs arg(argc, argv);
+    gLog.Setup(arg);
+
     StartUpMessage();
-
-    //
-    // Evaluate arguments
-    //
-    MArgs arg(argc, argv);
 
     if (arg.HasOnly("-V") || arg.HasOnly("--version"))
@@ -160 +161 @@
         return 2;
     }
-
-    gLog.Setup(arg);
 
     const Int_t  kComprlvl   = arg.GetIntAndRemove("-c", 2);

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -89 +89 @@
         // TBranchElement::kDeleteObject = BIT(16)
         // TTree::kFriendLock = BIT(17)
-        kIsNewTree  = BIT(17)
+        kIsNewTree  = BIT(23)
     };
 

trunk/MagicSoft/Mars/mhflux/FluxLinkDef.h

@@ -8 +8 @@
 
 #pragma link C++ class MHAlpha+;
-#pragma link C++ class MHTheta+;
+#pragma link C++ class MHThetaSq+;
 #pragma link C++ class MHEnergyEst+;
 #pragma link C++ class MHFalseSource+;
 #pragma link C++ class MHEffectiveOnTime+;
 #pragma link C++ class MHCollectionArea+;
+#pragma link C++ class MMatrixHist+;
+#pragma link C++ class MMatrixUnfold+;
+#pragma link C++ class MUnfoldBert+;
 
 #endif

trunk/MagicSoft/Mars/mhflux/Makefile

@@ -27 +27 @@
            MHEnergyEst.cc \
            MHAlpha.cc \
-           MHTheta.cc \
+           MHThetaSq.cc \
            MHEnergyEst.cc \
+           MUnfolding.cc \
            MHEffectiveOnTime.cc \
            MHCollectionArea.cc \

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -107 +107 @@
     TVirtualPad *save = gPad;
     gPad = 0;
+    /*
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
     SetPalette(1, 0);
-#else
+#endif
+    */
+/*
+#if ROOT_VERSION_CODE < ROOT_VERSION(4,04,00)
     SetPrettyPalette();
+#elese
     // WORAROUND - FIXME: Calling it many times becomes slower and slower
-    //SetInvDeepBlueSeaPalette();
+    SetInvDeepBlueSeaPalette();
 #endif
+*/
     gPad = save;
 }
@@ -121 +127 @@
 //  Default Constructor. To be used by the root system ONLY.
 //
-MHCamera::MHCamera() : TH1D(), fGeomCam(NULL), fColors(kItemsLegend), fAbberation(0)
+MHCamera::MHCamera() : TH1D(), fGeomCam(NULL), fAbberation(0)
 {
     Init();
@@ -133 +139 @@
 //
 MHCamera::MHCamera(const MGeomCam &geom, const char *name, const char *title)
-: fGeomCam(NULL), fColors(kItemsLegend), fAbberation(0)
+: fGeomCam(NULL), fAbberation(0)
 {
     //fGeomCam = (MGeomCam*)geom.Clone();
@@ -463 +469 @@
 //                 GeMinimum() ((val-min)/(max-min))
 //   'proj'        Display the y-projection of the histogram
+//   'pal0'        Use Pretty palette
+//   'pal1'        Use Deep Blue Sea palette
+//   'pal2'        Use Inverse Depp Blue Sea palette
 //   'same'        Draw trandparent pixels on top of an existing pad. This
 //                 makes it possible to draw the camera image on top of an
@@ -970 +979 @@
     {
         opt.ReplaceAll("hist", "");
+        opt.ReplaceAll("box", "");
+        opt.ReplaceAll("pixelindex", "");
+        opt.ReplaceAll("sectorindex", "");
+        opt.ReplaceAll("content", "");
+        opt.ReplaceAll("proj", "");
+        opt.ReplaceAll("pal0", "");
+        opt.ReplaceAll("pal1", "");
+        opt.ReplaceAll("pal2", "");
         TH1D::Paint(opt);
         return;
@@ -1007 +1024 @@
     }
 
+    const Bool_t pal1 = opt.Contains("pal1");
+    const Bool_t pal2 = opt.Contains("pal2");
+
+    if (!pal1 && !pal2)
+        SetPrettyPalette();
+
+    if (pal1)
+        SetDeepBlueSeaPalette();
+
+    if (pal2)
+        SetInvDeepBlueSeaPalette();
+
     // Update Contents of the pixels and paint legend
     Update(gPad->GetLogy(), hasbox, hascol, hassame);
@@ -1021 +1050 @@
 }
 
+void MHCamera::SetDrawOption(Option_t *option)
+{
+    // This is a workaround. For some reason MHCamera is
+    // stored in a TObjLink instead of a TObjOptLink
+    if (!option || !gPad)
+        return;
+
+    TListIter next(gPad->GetListOfPrimitives());
+    delete gPad->FindObject("Tframe");
+    TObject *obj;
+    while ((obj = next()))
+        if (obj == this && (TString)next.GetOption()!=(TString)option)
+        {
+            gPad->GetListOfPrimitives()->Remove(this);
+            gPad->GetListOfPrimitives()->AddFirst(this, option);
+            return;
+        }
+}
+
 // ------------------------------------------------------------------------
 //
@@ -1053 +1101 @@
     else
         gStyle->SetPalette(ncolors, colors);
-
-    fColors.Set(kItemsLegend);
-    for (int i=0; i<kItemsLegend; i++)
-        fColors[i] = gStyle->GetColorPalette(i);
 }
 
@@ -1068 +1112 @@
 void MHCamera::SetPrettyPalette()
 {
-    if (!TString(GetDrawOption()).Contains("hist", TString::kIgnoreCase))
+    TString opt(GetDrawOption());
+
+    if (!opt.Contains("hist", TString::kIgnoreCase))
         SetPalette(1, 0);
+
+    opt.ReplaceAll("pal1", "");
+    opt.ReplaceAll("pal2", "");
+
+    SetDrawOption(opt);
 }
 
@@ -1080 +1131 @@
 void MHCamera::SetDeepBlueSeaPalette()
 {
-    if (!TString(GetDrawOption()).Contains("hist", TString::kIgnoreCase))
+    TString opt(GetDrawOption());
+
+    if (!opt.Contains("hist", TString::kIgnoreCase))
         SetPalette(51, 0);
+
+    opt.ReplaceAll("pal1", "");
+    opt.ReplaceAll("pal2", "");
+    opt += "pal1";
+
+    SetDrawOption(opt);
 }
 
@@ -1092 +1151 @@
 void MHCamera::SetInvDeepBlueSeaPalette()
 {
-    if (!TString(GetDrawOption()).Contains("hist", TString::kIgnoreCase))
+    TString opt(GetDrawOption());
+
+    if (!opt.Contains("hist", TString::kIgnoreCase))
         SetPalette(52, 0);
+
+    opt.ReplaceAll("pal1", "");
+    opt.ReplaceAll("pal2", "");
+    opt += "pal2";
+
+    SetDrawOption(opt);
 }
 
@@ -1515 +1582 @@
 
     if (val >= max)
-        return fColors[maxcolidx];
+        return gStyle->GetColorPalette(maxcolidx);
 
     if (val <= min)
-        return fColors[0];
+        return gStyle->GetColorPalette(0);
 
     //
@@ -1530 +1597 @@
 
     const Int_t colidx = (Int_t)(ratio*maxcolidx + .5);
-    return fColors[colidx];
+    return gStyle->GetColorPalette(colidx);
 }
 
@@ -1612 +1679 @@
     for (Int_t i=0; i<kItemsLegend; i++)
     {
-        newbox.SetFillColor(fColors[i]);
+        newbox.SetFillColor(gStyle->GetColorPalette(i));
         newbox.PaintBox(range, H*(i*h-1)-offset, range+w, H*((i+1)*h-1)-offset);
     }

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -48 +48 @@
     TArrayI        fBinEntries;  // number of entries per bin
 
-    TArrayI        fColors;      //! Color conversion table
     TList         *fNotify;      //!
 
@@ -214 +213 @@
     char    *GetObjectInfo(Int_t px, Int_t py) const;
     void     ExecuteEvent(Int_t event, Int_t px, Int_t py);
+    void     SetDrawOption(Option_t *option); //*MENU*
 
     void     SetPalette(Int_t ncolors, Int_t *colors);
@@ -222 +222 @@
 
     void     SetAutoScale() { fMinimum = fMaximum = -1111; } // *MENU*
-    void     DisplayAsHistogram() { SetDrawOption("histEP"); } // *MENU*
-    void     DisplayAsCamera() { SetDrawOption(""); } // *MENU*
 
     void     SetFreezed(Bool_t f=kTRUE) { f ? SetBit(kFreezed) : ResetBit(kFreezed); } // *TOGGLE* *GETTER=IsFreezed

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -78 +78 @@
     : fStoreSummary(kFALSE), fStoreResult(kTRUE), fWriteOnly(kFALSE),
     fIsWobble(kFALSE), fIsMonteCarlo(kFALSE),  fFullDisplay(kFALSE),
-    fNameHist("MHTheta"), fCalcHadronness(0)
+    fNameHist("MHThetaSq"), fCalcHadronness(0)
 {
     fName  = name  ? name  : "MJCut";
@@ -428 +428 @@
     MBinning bins7("BinningDist");
     MBinning bins8("BinningMaxDist");
+    MBinning bins9("BinningM3Long");
+    MBinning bins0("BinningConc1");
     plist.AddToList(&bins1);
     plist.AddToList(&bins2);
@@ -436 +438 @@
     plist.AddToList(&bins7);
     plist.AddToList(&bins8);
+    plist.AddToList(&bins9);
+    plist.AddToList(&bins0);
 
     // --------------------------------------------------------------------------------

trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

@@ -181 +181 @@
     eval->SetVal(0);
 
+    const Bool_t isnull = gLog.IsNullOutput();
     if (fDebug<3)
         gLog.SetNullOutput(kTRUE);
@@ -190 +191 @@
 
     if (fDebug<3)
-        gLog.SetNullOutput(kFALSE);
+        gLog.SetNullOutput(isnull);
 
     const Double_t f = eval->GetVal();

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -178 +178 @@
         return -1;
 
+    TObject *hist = arr.FindObjectInCanvas("Hist", "MHAlpha", "Hist");
+    cout << "HIST: " << hist << endl;
+    if (hist)
+        cout << "TYPE: " << hist->ClassName() << endl;
+    arr.Print();
+
     vstime->Copy(h1);
     size->Copy(h2);
@@ -344 +350 @@
     taskenv1.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
 
-    MFillH fill1("HistOff [MHAlpha]", "MHillasSrc", "FillHistOff");
-    MFillH fill2("HistOn  [MHAlpha]", "MHillasSrc", "FillHistOn");
+    MFillH fill1("HistEOff [MHAlpha]", "MHillasSrc", "FillHistEOff");
+    MFillH fill2("HistE    [MHAlpha]", "MHillasSrc", "FillHistE");
 
     MFDataMember f0("DataType.fVal", '<', 0.5, "FilterOffData");
@@ -382 +388 @@
     }
 
-    const MHAlpha *halpha = (MHAlpha *)plist.FindObject("HistOn");
+    const MHAlpha *halpha = (MHAlpha *)plist.FindObject("HistE");
     if (!halpha)
     {
-        *fLog << err << GetDescriptor() << ": HistOn [MHAlpha] not found... abort." << endl;
+        *fLog << err << GetDescriptor() << ": HistE [MHAlpha] not found... abort." << endl;
         return kFALSE;
     }
@@ -597 +603 @@
     *fLog << inf << "Reading from file: " << fPathIn << endl;
 
-    cout << "Opening..." << endl;
     TFile file(fPathIn, "READ");
     if (!file.IsOpen())
@@ -605 +610 @@
     }
 
-    cout << "Reading..." << endl;
     file.cd();
     MStatusArray arr;
@@ -614 +618 @@
     }
 
-    cout << "Searching..." << endl;
-
     TH1 *excess = (TH1D*)arr.FindObjectInCanvas("Excess", "TH1D", "Hist");
     if (!excess)
         return kFALSE;
-
-    cout << "Displaying..." << endl;
 
     // ------------------- Plot excess versus size ------------------- 
@@ -638 +638 @@
     // Don't do this on the original object!
     excess->SetStats(kFALSE);
-
-    cout << "ExcessSize..." << endl;
 
     TObject *o=0;
@@ -656 +654 @@
     }
 
-    cout << "Dist..." << endl;
-
     // -------------- Comparison of Image Parameters --------------
     c.cd(2);
     PlotSame(arr, plist, "Dist",   "HilSrc",  "MHHilSrcMCPost");
 
-    cout << "Length..." << endl;
-
     c.cd(3);
     PlotSame(arr, plist, "Length", "PostCut", "MHHillasMCPost");
 
-    cout << "M3l..." << endl;
-
     c.cd(4);
     PlotSame(arr, plist, "M3l",    "HilExt",  "MHHilExtMCPost");
 
-    cout << "Conc1..." << endl;
-
     c.cd(5);
     PlotSame(arr, plist, "Conc1",  "NewPar",  "MHNewParMCPost");
-
-    cout << "Width..." << endl;
 
     c.cd(6);
@@ -710 +698 @@
     MBinning bins7("BinningDist");
     MBinning bins8("BinningMaxDist");
+    MBinning bins9("BinningM3Long");
+    MBinning bins0("BinningConc1");
 
     MAlphaFitter fit;
@@ -722 +712 @@
     plist.AddToList(&bins7);
     plist.AddToList(&bins8);
+    plist.AddToList(&bins9);
+    plist.AddToList(&bins0);
     plist.AddToList(&fit);
 

trunk/MagicSoft/Mars/readdaq.cc

@@ -51 +51 @@
     gLog << "   readdaq [-h] [-?] [-vn] [-dec] [-a0] inputfile[.raw]" << endl << endl;
     gLog << "     input file:   Magic DAQ binary file." << endl;
-    gLog << "     -a0: Do not use Ansii codes." << endl;
-    gLog << "     -vn: Verbosity level n [default=2]" << endl;
+    gLog.Usage();
     gLog << "     -d1: print data in decimal values" << endl;
     gLog << "     -c1: print MRawCrateArray data" << endl;
@@ -60 +59 @@
 int main(int argc, char **argv)
 {
-    StartUpMessage();
-
     //
     // Evaluate arguments
     //
     MArgs arg(argc, argv);
+    gLog.Setup(arg);
+
+    StartUpMessage();
 
     if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))
@@ -76 +76 @@
     // Set verbosity to highest level.
     //
-    gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
-
-    if (arg.HasOption("-a") && arg.GetIntAndRemove("-a")==0)
-        gLog.SetNoColors();
-
     const bool kDecimal    = arg.HasOption("-d") && arg.GetIntAndRemove("-d")==1;
     const bool kPrintArray = arg.HasOption("-c") && arg.GetIntAndRemove("-c")==1;

trunk/MagicSoft/Mars/readraw.cc

@@ -54 +54 @@
     gLog << "   readraw [-h] [-?] [-vn] [-dec] [-a0] inputfile[.root]" << endl << endl;
     gLog << "     input file:   Magic DAQ binary file." << endl;
-    gLog << "     -vn: Verbosity level n [default=2]" << endl;
+    gLog.Usage();
     gLog << "     -d, --dec: print data in decimal values" << endl;
     gLog << "     -a, --no-colors: Do not use Ansii color codes" << endl;
@@ -71 +71 @@
 int main(int argc, char **argv)
 {
-    StartUpMessage();
-
     // Evaluate arguments
     MArgs arg(argc, argv);
+    gLog.Setup(arg);
+
+    StartUpMessage();
 
     // check for the right usage of the program
@@ -83 +84 @@
         return 2;
     }
-
-    // Set verbosity
-    gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
-
-    // Set color usage
-    if (arg.HasOnlyAndRemove("--no-colors") || arg.HasOnlyAndRemove("-a"))
-        gLog.SetNoColors();
 
     // Set usage of decimal values

trunk/MagicSoft/Mars/showlog.cc

@@ -100 +100 @@
             s.ReplaceAll("", "\033");
 
-        // Check whether it is an empty line
-        if (s=="\033[0m")
+        const char *end = s.Data()+s.Length();
+        for (const char *c=s.Data(); c<end; c++)
         {
-            gLog << endl;
-            continue;
-        }
+            char *to = NULL;
+            Int_t n  = -1;
 
-        while (!s.IsNull())
-        {
-            Ssiz_t pos = s.First("\033[");
-            if (pos<0)
+            if (c+1<end-1 && *c=='\033' && *(c+1)=='[')
+                n = strtol(c+2, &to, 10);
+
+            if (to==NULL || *to!='m')
             {
-                gLog << s;
-                break;
+                gLog << *c;
+                continue;
             }
 
-            gLog << s(0, pos);
-            s.Remove(0, pos+1);
-            if (s.BeginsWith("0m") && s.Length()>3)
+            c = to;
+
+            switch (n)
             {
-                gLog << all;
-                s.Remove(0, 2);
+            case 0:
+                if (c<end-1)
+                    gLog << flush << all;
+                continue;
+            case 31:
+                gLog << flush << err;
+                continue;
+            case 32:
+                gLog << flush << inf;
+                continue;
+            case 33:
+                gLog << flush << warn;
+                continue;
+            case 34:
+                gLog << flush << dbg;
                 continue;
             }
-            if (s.BeginsWith("31m"))
-            {
-                gLog << err;
-                s.Remove(0, 3);
-                continue;
-            }
-            if (s.BeginsWith("32m"))
-            {
-                gLog << inf;
-                s.Remove(0, 3);
-                continue;
-            }
-            if (s.BeginsWith("33m"))
-            {
-                gLog << warn;
-                s.Remove(0, 3);
-                continue;
-            }
-            if (s.BeginsWith("34m"))
-            {
-                gLog << dbg;
-                s.Remove(0, 3);
-                continue;
-            }
-            gLog << "\033[";
+            gLog << flush << "\033[" << n << "m";
         }
-        gLog << endl;
+        gLog << endl << all;
     }
 

trunk/MagicSoft/Mars/showplot.cc

@@ -37 +37 @@
     gLog << "   -q                        Quit when job is finished" << endl;
     gLog << endl;
-    gLog << " Output Options: "<< endl;
+    gLog << " General Output Options: "<< endl;
+    gLog << "   --print[=printer]         Print to printer" << endl;
     gLog << "   --save-as-ps[=filename]   Save plots as postscript" << endl;
+    gLog << "   --save-as-pdf[=filename]  Save plots as pdf-file" << endl;
+    gLog << "   --save-as-svg[=filename]  Save plots as svg-file" << endl;
+    gLog << "   --save-as-root[=filename] Save plots as root file" << endl;
+    gLog << "   --save-as-C[=filename]    Save plots as root scripts" << endl;
+    gLog << "   --tab=num                 Save only tab number num" << endl << endl;
+    gLog << " Print only options:" << endl;
+    gLog << "   --print-cmd='lpr -P%p %f' Set the printer command" << endl;
+    gLog << "   --print-dir=/tmp          Set the printing temp directory" << endl << endl;
+    gLog << " GUI only options:" << endl;
     gLog << "   --save-as-gif[=filename]  Save plots as gif files" << endl;
-    gLog << "   --save-as-C[=filename]    Save plots as root scripts" << endl;
-    gLog << "   --tab=num                 Save only tab number num" << endl;
+    gLog << "   --save-as-jpg[=filename]  Save plots as jpg files" << endl;
+    gLog << "   --save-as-xpm[=filename]  Save plots as xpm files" << endl;
+    gLog << "   --save-as-png[=filename]  Save plots as png files" << endl;
     gLog << endl;
     gLog << "   --version, -V             Show startup message with version number" << endl;
@@ -49 +60 @@
     gLog << " Use showplot to display a MStatusArray in an MStatusDisplay." << endl;
     gLog << " MStatusArrays are typically written by programs showing data" << endl;
-    gLog << " check plots, like callisto." << endl;
+    gLog << " check plots, like callisto." << endl << endl;
+    gLog << "Printing:" << endl;
+    gLog << " For more details see MStatusDisplay::PrintPS" << endl << endl;
+    gLog << "Examples:" << endl;
+    gLog << " showplot filename.root" << endl;
+    gLog << " showplot -b --null --print --print-cmd='psnup -2 %f' filename.root | lpr" << endl;
+    gLog << " showplot -b --print --print-cmd='psbook %f | psnup -2 | lpr' filename.root" << endl;
+    gLog << " showplot -b --print --print-cmd='cat %f' filename.root > filename.ps" << endl;
+    gLog << " showplot -b --save-as-ps filename.root" << endl;
+    gLog << " showplot -q --save-as-gif=tab5.gif --tab=5 filename.root" << endl;
+    gLog << " showplot -b --save-as-ps --print=lp2 filename.root" << endl;
     gLog << endl;
 }
@@ -55 +76 @@
 int main(int argc, char **argv)
 {
+    //
+    // Evaluate arguments
+    //
+    MArgs arg(argc, argv, kTRUE);
+    gLog.Setup(arg);
+
     StartUpMessage();
-
-    //
-    // Evaluate arguments
-    //
-    MArgs arg(argc, argv, kTRUE);
 
     if (arg.HasOnly("-V") || arg.HasOnly("--version"))
@@ -71 +93 @@
     }
 
-    gLog.Setup(arg);
-
-    const Bool_t kQuit      = arg.HasOnlyAndRemove("-q");
-    const Bool_t kBatch     = arg.HasOnlyAndRemove("-b");
-
-    const Int_t  kTab       = arg.GetIntAndRemove("--tab=", -1);
-
-    const Bool_t kSaveAsPs  = arg.HasOnlyAndRemove("--save-as-ps")  || arg.Has("--save-as-ps=");
-    const Bool_t kSaveAsGif = arg.HasOnlyAndRemove("--save-as-gif") || arg.Has("--save-as-gif=");
-    const Bool_t kSaveAsC   = arg.HasOnlyAndRemove("--save-as-C")   || arg.Has("--save-as-C=");
-
-    TString kNamePs  = arg.GetStringAndRemove("--save-as-ps=");
-    TString kNameGif = arg.GetStringAndRemove("--save-as-gif=");
-    TString kNameC   = arg.GetStringAndRemove("--save-as-C=");
+    const Bool_t kQuit       = arg.HasOnlyAndRemove("-q");
+    const Bool_t kBatch      = arg.HasOnlyAndRemove("-b");
+
+    const Int_t  kTab        = arg.GetIntAndRemove("--tab=", -1);
+
+    const Bool_t kPrint      = arg.HasOnlyAndRemove("--print")        || arg.Has("--print=");
+    const Bool_t kSaveAsPs   = arg.HasOnlyAndRemove("--save-as-ps")   || arg.Has("--save-as-ps=");
+    const Bool_t kSaveAsPdf  = arg.HasOnlyAndRemove("--save-as-pdf")  || arg.Has("--save-as-pdf=");
+    const Bool_t kSaveAsSvg  = arg.HasOnlyAndRemove("--save-as-svg")  || arg.Has("--save-as-svg=");
+    const Bool_t kSaveAsGif  = arg.HasOnlyAndRemove("--save-as-gif")  || arg.Has("--save-as-gif=");
+    const Bool_t kSaveAsJpg  = arg.HasOnlyAndRemove("--save-as-jpg")  || arg.Has("--save-as-jpg=");
+    const Bool_t kSaveAsXpm  = arg.HasOnlyAndRemove("--save-as-xpm")  || arg.Has("--save-as-xpm=");
+    const Bool_t kSaveAsPng  = arg.HasOnlyAndRemove("--save-as-png")  || arg.Has("--save-as-png=");
+    const Bool_t kSaveAsRoot = arg.HasOnlyAndRemove("--save-as-root") || arg.Has("--save-as-root=");
+    const Bool_t kSaveAsC    = arg.HasOnlyAndRemove("--save-as-C")    || arg.Has("--save-as-C=");
+
+    TString kNamePrint = arg.GetStringAndRemove("--print=");
+    TString kPrintCmd  = arg.GetStringAndRemove("--print-cmd=");
+    TString kPrintDir  = arg.GetStringAndRemove("--print-dir=");
+    TString kNamePs    = arg.GetStringAndRemove("--save-as-ps=");
+    TString kNamePdf   = arg.GetStringAndRemove("--save-as-pdf=");
+    TString kNameSvg   = arg.GetStringAndRemove("--save-as-svg=");
+    TString kNameGif   = arg.GetStringAndRemove("--save-as-gif=");
+    TString kNameJpg   = arg.GetStringAndRemove("--save-as-jpg=");
+    TString kNameXpm   = arg.GetStringAndRemove("--save-as-xpm=");
+    TString kNamePng   = arg.GetStringAndRemove("--save-as-png=");
+    TString kNameRoot  = arg.GetStringAndRemove("--save-as-root=");
+    TString kNameC     = arg.GetStringAndRemove("--save-as-C=");
 
 
@@ -90 +126 @@
     // check for the right usage of the program
     //
+    if (arg.GetNumOptions()>0)
+    {
+        gLog << err << "Unknown commandline options..." << endl;
+        arg.Print("options");
+        gLog << endl;
+        return 3;
+    }
     if (arg.GetNumArguments()!=1)
     {
@@ -96 +139 @@
     }
 
-    TApplication app("Showplot", &argc, argv);
+    TApplication app("showplot", &argc, argv);
     if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
     {
@@ -108 +151 @@
     const TString kInput = arg.GetArgumentStr(0);
 
-    if (kNamePs.IsNull()  && kSaveAsPs)
+    if (kNamePs.IsNull()    && kSaveAsPs)
         kNamePs = kInput;
-    if (kNameGif.IsNull() && kSaveAsGif)
+    if (kNamePdf.IsNull()   && kSaveAsPdf)
+        kNamePdf = kInput;
+    if (kNameSvg.IsNull()   && kSaveAsSvg)
+        kNameSvg = kInput;
+    if (kNameGif.IsNull()   && kSaveAsGif)
         kNameGif = kInput;
-    if (kNameC.IsNull()   && kSaveAsC)
+    if (kNameJpg.IsNull()   && kSaveAsJpg)
+        kNameJpg = kInput;
+    if (kNameXpm.IsNull()   && kSaveAsXpm)
+        kNameXpm = kInput;
+    if (kNamePng.IsNull()   && kSaveAsPng)
+        kNamePng = kInput;
+    if (kNameRoot.IsNull()  && kSaveAsRoot)
+        kNameRoot = kInput;
+    if (kNameC.IsNull()     && kSaveAsC)
         kNameC = kInput;
 
@@ -124 +179 @@
     d->Open(kInput);
 
+    if (kPrint)
+        d->PrintPS(kTab,    kNamePrint, kPrintCmd, kPrintDir);
     if (kSaveAsPs)
-        d->SaveAsPS(kTab, kNamePs);
+        d->SaveAsPS(kTab,   kNamePs);
+    if (kSaveAsPdf)
+        d->SaveAsPDF(kTab,  kNamePdf);
+    if (kSaveAsSvg)
+        d->SaveAsSVG(kTab,  kNameSvg);
     if (kSaveAsGif)
-        d->SaveAsGIF(kTab, kNameGif);
+        d->SaveAsGIF(kTab,  kNameGif);
+    if (kSaveAsJpg)
+        d->SaveAsJPG(kTab,  kNameJpg);
+    if (kSaveAsXpm)
+        d->SaveAsXPM(kTab,  kNameXpm);
+    if (kSaveAsPng)
+        d->SaveAsPNG(kTab,  kNamePng);
+    if (kSaveAsRoot)
+        d->SaveAsRoot(kTab, kNameRoot);
     if (kSaveAsC)
-        d->SaveAsC(kTab, kNameC);
+        d->SaveAsC(kTab,    kNameC);
 
     if (kBatch || kQuit)

trunk/MagicSoft/Mars/sinope.cc

@@ -249 +249 @@
 int main(int argc, char **argv)
 {
+    //
+    // Evaluate arguments
+    //
+    MArgs arg(argc, argv, kTRUE);
+    gLog.Setup(arg);
+
     StartUpMessage();
-
-    //
-    // Evaluate arguments
-    //
-    MArgs arg(argc, argv, kTRUE);
 
     if (arg.HasOnly("-V") || arg.HasOnly("--version"))
@@ -264 +265 @@
         return 2;
     }
-
-    gLog.Setup(arg);
 
     //const TString kConfig     = arg.GetStringAndRemove("--config=", "callisto.rc");
@@ -379 +378 @@
     MParContainer::Class()->IgnoreTObjectStreamer();
 
-    TApplication app("Sinope", &argc, argv);
+    TApplication app("sinope", &argc, argv);
     if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
     {

trunk/MagicSoft/Mars/sponde.cc

@@ -89 +89 @@
 int main(int argc, char **argv)
 {
+    //
+    // Evaluate arguments
+    //
+    MArgs arg(argc, argv, kTRUE);
+    gLog.Setup(arg);
+
     StartUpMessage();
-
-    //
-    // Evaluate arguments
-    //
-    MArgs arg(argc, argv, kTRUE);
 
     if (arg.HasOnly("-V") || arg.HasOnly("--version"))
@@ -104 +105 @@
         return 2;
     }
-
-    gLog.Setup(arg);
 
     const TString kConfig       =  arg.GetStringAndRemove("--config=", "sponde.rc");
@@ -184 +183 @@
     MParContainer::Class()->IgnoreTObjectStreamer();
 
-    TApplication app("Sponde", &argc, argv);
+    TApplication app("sponde", &argc, argv);
     if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
     {

trunk/MagicSoft/Mars/star.cc

@@ -91 +91 @@
 int main(int argc, char **argv)
 {
+    //
+    // Evaluate arguments
+    //
+    MArgs arg(argc, argv, kTRUE);
+    gLog.Setup(arg);
+
     StartUpMessage();
-
-    //
-    // Evaluate arguments
-    //
-    MArgs arg(argc, argv, kTRUE);
 
     if (arg.HasOnly("-V") || arg.HasOnly("--version"))
@@ -106 +107 @@
         return 2;
     }
-
-    gLog.Setup(arg);
 
     const TString kConfig     = arg.GetStringAndRemove("--config=", "star.rc");
@@ -193 +192 @@
     MParContainer::Class()->IgnoreTObjectStreamer();
 
-    TApplication app("Star", &argc, argv);
+    TApplication app("star", &argc, argv);
     if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch)
     {