Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 2771) +++ /trunk/MagicSoft/Mars/Changelog (revision 2772) @@ -4,4 +4,26 @@ -*-*- END OF LINE -*-*- + 2004/01/12: Thomas Bretz + + * macros/rootlogon.C: + - added mcamera to include path + - added mpointing to include path + - added mreport to include path + + * mbase/MLog.cc: + - updated my eMail address + + * mbase/MParContainer.h: + - added Read member function + + * mbase/MStatusDisplay.[h,cc]: + - changed size of ps-paper + - added a user defined bottom line to the ps-files + + * mraw/MRawRunHeader.cc: + - added some comments + + + 2004/01/12: Abelardo Moralejo @@ -11,4 +33,6 @@ Bug had no effect unless scale1 != scale2 (-> telescopes of different size). + + 2004/01/12: Markus Gaug Index: /trunk/MagicSoft/Mars/macros/rootlogon.C =================================================================== --- /trunk/MagicSoft/Mars/macros/rootlogon.C (revision 2771) +++ /trunk/MagicSoft/Mars/macros/rootlogon.C (revision 2772) @@ -100,4 +100,5 @@ gInterpreter->AddIncludePath(dir+"manalysis"); gInterpreter->AddIncludePath(dir+"mbase"); + gInterpreter->AddIncludePath(dir+"mcamera"); gInterpreter->AddIncludePath(dir+"mcalib"); gInterpreter->AddIncludePath(dir+"mdata"); @@ -113,7 +114,9 @@ gInterpreter->AddIncludePath(dir+"mmc"); gInterpreter->AddIncludePath(dir+"mmontecarlo"); + gInterpreter->AddIncludePath(dir+"mpointing"); gInterpreter->AddIncludePath(dir+"mranforest"); gInterpreter->AddIncludePath(dir+"mraw"); gInterpreter->AddIncludePath(dir+"mreflector"); + gInterpreter->AddIncludePath(dir+"mreport"); gInterpreter->AddIncludePath(dir+"mtools"); Index: /trunk/MagicSoft/Mars/mbase/MLog.cc =================================================================== --- /trunk/MagicSoft/Mars/mbase/MLog.cc (revision 2771) +++ /trunk/MagicSoft/Mars/mbase/MLog.cc (revision 2772) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz 12/2000 -! -! Copyright: MAGIC Software Development, 2000-2001 +! Author(s): Thomas Bretz, 12/2000 +! +! Copyright: MAGIC Software Development, 2000-2004 ! ! Index: /trunk/MagicSoft/Mars/mbase/MParContainer.h =================================================================== --- /trunk/MagicSoft/Mars/mbase/MParContainer.h (revision 2771) +++ /trunk/MagicSoft/Mars/mbase/MParContainer.h (revision 2772) @@ -110,4 +110,6 @@ virtual Bool_t AsciiWrite(ostream &out) const; + Int_t Read(const char *name=NULL) { return TObject::Read(name?name:(const char*)fName); } + virtual void GetNames(TObjArray &arr) const; virtual void SetNames(TObjArray &arr); Index: /trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc =================================================================== --- /trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc (revision 2771) +++ /trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc (revision 2772) @@ -1763,5 +1763,8 @@ // To write all tabs you can also use SaveAsPS(name) // -Int_t MStatusDisplay::SaveAsPS(Int_t num, TString name) +// If the third argument is given a bottom line is drawn with the text +// under it. +// +Int_t MStatusDisplay::SaveAsPS(Int_t num, TString name, const TString addon) { SetStatusLine1("Writing Postscript file..."); @@ -1830,9 +1833,9 @@ // - // 26 is used here to scale the canvas into a height of 26, + // 28 is used here to scale the canvas into a height of 28, // such that the page title can be set above the canvas... // - Float_t psw = 26; //29.7; // A4 - width - Float_t psh = 21.0; // A4 - height + Float_t psw = 28.0; // A4 - width (29.7) + Float_t psh = 21.0; // A4 - height (21.0) const Float_t cw = c->GetWw(); @@ -1853,4 +1856,5 @@ CanvasSetFillColor(*n, kWhite); l.Add(n); + // // Paint canvas into root file @@ -1878,10 +1882,17 @@ ps.SetTextFont(22); ps.SetTextAlign(11); // left top - ps.TextNDC(0, 1.02, TString(" ")+n->GetName()); + ps.TextNDC(0, 1.015, TString(" ")+n->GetName()); ps.SetTextAlign(21); // cent top - ps.TextNDC(0.5, 1.02, TString("MARS - Magic Analysis and Reconstruction Software - ")+d.AsString()); + ps.TextNDC(0.5, 1.015, TString("MARS - Magic Analysis and Reconstruction Software - ")+d.AsString()); ps.SetTextAlign(31); // right top - ps.TextNDC(1, 1.02, Form("Page No.%i (%i) ", page++, i)); - line.PaintLineNDC(0, 1.015, 1, 1.015); + ps.TextNDC(1, 1.015, Form("Page No.%i (%i) ", page++, i)); + line.PaintLineNDC(0, 1.01, 1, 1.01); + + if (!addon.IsNull()) + { + line.PaintLineNDC(0, -0.00, 1, -0.00); + ps.SetTextAlign(23); // cent bottom + ps.TextNDC(0.5, -0.005, addon); + } // Index: /trunk/MagicSoft/Mars/mbase/MStatusDisplay.h =================================================================== --- /trunk/MagicSoft/Mars/mbase/MStatusDisplay.h (revision 2771) +++ /trunk/MagicSoft/Mars/mbase/MStatusDisplay.h (revision 2772) @@ -162,5 +162,5 @@ void SetNoContextMenu(Bool_t flag=kTRUE); - Int_t SaveAsPS(TString name="") { return SaveAsPS(-1, name); } + Int_t SaveAsPS(TString name="", const TString addon="") { return SaveAsPS(-1, name, addon); } Bool_t SaveAsGIF(TString name="") { return SaveAsGIF(-1, name); } Bool_t SaveAsC(TString name="") { return SaveAsC(-1, name); } @@ -168,5 +168,5 @@ Int_t PrintToLpr() { return PrintToLpr(-1); } - Int_t SaveAsPS(Int_t num, TString name=""); + Int_t SaveAsPS(Int_t num, TString name="", const TString addon=""); Bool_t SaveAsGIF(Int_t num, TString name=""); Bool_t SaveAsC(Int_t num, TString name=""); Index: /trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc =================================================================== --- /trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc (revision 2771) +++ /trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc (revision 2772) @@ -243,5 +243,12 @@ // -------------------------------------------------------------------------- // -// return the number of pixel in this event. +// Return the number of pixel in this event. +// +// WARNING: This is the number of pixels stored in this file which is +// a multiple of the number of pixels per crate and in general +// a number which is larger than the camera size! +// +// To know the range of the pixel indices please use the geometry +// container! // UShort_t MRawRunHeader::GetNumPixel() const