Changeset 8750 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
10/05/07 15:35:31 (17 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8746 r8750  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2007/10/05 Thomas Bretz
     22
     23   * sponde.rc, sponde_onoff.rc:
     24     - fixed a bug. Must be Spectrum now instead of MJSpectrum
     25
     26   * mbase/MReadSocket.cc:
     27     - do not create an explicit TDatime instance
     28
     29   * mjobs/MJSpectrum.cc:
     30     - fixed a problem with writing the Dataset to the file
     31
     32   * mpointing/MPointingDevCalc.cc:
     33     - added a comment about AMC focussing
     34
     35   * mtools/MCalendar.[h,cc]:
     36     - made DrawImage a static function
     37
     38
    2039
    2140 2007/09/17 Thomas Bretz

  • trunk/MagicSoft/Mars/mbase/MReadSocket.cc

    r2492 r8750  
    136136        const TTime timeout = gSystem->Now() + TTime(5000);
    137137
    138         TDatime now;
    139         cout << now.AsString() << ": Waiting for connection..." << endl;
     138        cout << TDatime().AsString() << ": Waiting for connection..." << endl;
    140139
    141140        //

  • trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

    r8746 r8750  
    16991699    // Write the output
    17001700    TObjArray cont;
    1701     cont.Add((TObject*)GetEnv());
     1701    cont.Add((TObject*)GetEnv()); // const_cast
     1702    cont.Add((TObject*)&set);     // const_cast
    17021703    cont.Add(&area0);
    17031704    cont.Add(&area1);
    17041705    cont.Add(&hest);
    1705     cont.Add(&set);
    17061706
    17071707    if (fDisplay)

  • trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

    r8741 r8750  
    166166// Lid is closed. (< run 84980)
    167167//
     168// [2007-04-25 23:50:39]
     169// Markus is performing AMC focussing.
     170//
    168171// Mirror refocussing around 4.Aug.2007, from the Runbook:
    169172//

  • trunk/MagicSoft/Mars/mtools/MCalendar.cc

    r7923 r8750  
    13911391// DrawImage cd()'s to the new pad.
    13921392//
    1393 TASImage *MCalendar::DrawImage(const TASImage &img, Float_t x1, Float_t y1, Float_t x2, Float_t y2, Bool_t rot) const
     1393TASImage *MCalendar::DrawImage(const TASImage &img, Float_t x1, Float_t y1, Float_t x2, Float_t y2, Bool_t rot)
    13941394{
    13951395    TPad *pad=new TPad("Img", "Image", x1, y1, x2, y2);

  • trunk/MagicSoft/Mars/mtools/MCalendar.h

    r7893 r8750  
    177177
    178178    // Calendar sheet interface
    179     TASImage *DrawImage(const TASImage &img, Float_t x1, Float_t y1, Float_t x2, Float_t y2, Bool_t rot=kFALSE) const;
     179    static TASImage *DrawImage(const TASImage &img, Float_t x1, Float_t y1, Float_t x2, Float_t y2, Bool_t rot=kFALSE);
    180180    TASImage *GetImage(TEnv *env=NULL, const char *path="");
    181181    void      DrawLatex(Float_t x, Float_t y, const char *text, const TAttText &att);

  • trunk/MagicSoft/Mars/sponde.rc

    r8709 r8750  
    4141# Monte Carlo for determining the collection area there is no theta-
    4242# histogram involved, thus you need the theta cut switched on
    43 MJSpectrum.Cut1.ThetaCut: On
     43Spectrum.Cut1.ThetaCut: On
    4444
    4545# You may want to change the scale region to a different region than

  • trunk/MagicSoft/Mars/sponde_onoff.rc

    r8709 r8750  
    4141# Monte Carlo for determining the collection area there is no theta-
    4242# histogram involved, thus you need the theta cut switched on
    43 MJSpectrum.Cut1.ThetaCut: On
     43Spectrum.Cut1.ThetaCut: On
    4444
    4545# You may want to change the scale region to a different region than
Note: See TracChangeset for help on using the changeset viewer.