Changeset 7726 for trunk


Ignore:
Timestamp:
05/22/06 17:51:33 (19 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7725 r7726  
    2626     - replaced in FindBestSpllit* a sanity check for rld and rrd (do
    2727       not divide by zero) by a check whether the result (crit) is finite
     28
     29   * mcamera/MCameraRecTemp.[h,cc]:
     30     - implemented new data member for validity
     31     - increased class version by 1
     32
     33   * mpointing/MHPointing.[h,cc]:
     34     - implemented new TGraph for number of correlated stars
     35     - increased class version by 1
     36
     37   * mpointing/MPointingDevCalc.cc:
     38     - if the report is empty assume no pointing deviation and also
     39       reset the starguider calibration
     40
     41   * mpointing/MPointingPos.cc:
     42     - slight modifications to comment
     43
     44   * mreport/MReport.cc:
     45     - introduced new fake version to support new starguider format
     46
     47   * mreport/MReportCC.[h,cc]:
     48     - improved handling of receiver boar com-errors and RecTemp section
     49
     50   * mreport/MReportStarguider.[h,cc]:
     51     - implemented changes in the starguider reports around 9th May
     52     - added new data member for number of correlated stars
     53     - increased class version by 1
    2854
    2955

  • trunk/MagicSoft/Mars/NEWS

    r7720 r7726  
    33 *** Version  <cvs>
    44
    5    - merpp: better handling of problems with the TH and TD part of the
     5   - merpp: better handling of problems with the TH, TD part of the
    66     CC-REPORT for files older than 200507190 and 200412210
    77     respectively
     8
     9   - merpp: improved handling of RECEIVERS-COM-ERROR in CC-REPORT
     10
     11   - merpp: implementd latest changes in starguider reports (sinc 9th May)
     12
     13   - star: Show also the number of stars correlated correctly by the
     14     starguider
    815
    916   - ganymed: implemented a new class (MHThetaSqN) which allows to use more
    1017     than one off-source region in wobble-mode. To use it add the following to
    1118     your ganymed_wobble.rc:
    12        + MJCut.NameHist: MHThetaSqN             (switch the new feature on)
    13        + MHThetaSqN.NumOffSourcePos: 3          (define the number of off-regions)
    14        + MHThetaSqN.DoOffCut: Yes,No            (switch on/off the off-cut)
    15        + Cut1.ThetaCut: None
    16        + MHThetaSqN.SignificanceCutLevel: 2.0   (increase off-cut by 2.0/1.7)
     19      + MJCut.NameHist: MHThetaSqN            (switch the new feature on)
     20      + MHThetaSqN.NumOffSourcePos: 3         (define number of off-regions)
     21      + MHThetaSqN.DoOffCut: Yes,No           (switch on/off the off-cut)
     22      + Cut1.ThetaCut: None                 
     23      + MHThetaSqN.SignificanceCutLevel: 2.0  (increase off-cut by 2.0/1.7)
    1724
    1825

  • trunk/MagicSoft/Mars/mcamera/MCameraRecTemp.cc

    r7444 r7726  
    1919!   Author(s): Florian Goebel 11/2005 <mailto:fgoebel@mppmu.mpg.de>
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2005
     21!   Copyright: MAGIC Software Development, 2000-2006
    2222!
    2323!
    … …  
    2727//
    2828// MCameraRecTemp
     29//
     30// Class Version 2:
     31// ----------------
     32//   + Bool_t  fIsValid; // fTD contains valid information
    2933//
    3034/////////////////////////////////////////////////////////////////////////////
    … …  
    4549//
    4650MCameraRecTemp::MCameraRecTemp(Int_t size, const char *name, const char *title)
    47     : fRecTemp(size)
     51    : fRecTemp(size), fIsValid(kTRUE)
    4852{
    4953    fName  = name  ? name  : "MCameraRecTemp";

  • trunk/MagicSoft/Mars/mcamera/MCameraRecTemp.h

    r7444 r7726  
    1515private:
    1616    TArrayF fRecTemp; // [deg C] receiver board temperatures
     17    Bool_t  fIsValid; // fRecTemp contains valid information
    1718
    1819public:
    … …  
    2122    Float_t operator[](Int_t i) const { return fRecTemp[i]; }
    2223
     24    void Invalidate() { fRecTemp.Reset(); fIsValid=kFALSE; }
     25
     26    void SetValid(Bool_t v=kTRUE) { fIsValid=v; }
     27    Bool_t IsValid() const { return fIsValid; }
     28
    2329    Float_t GetMin() const;
    2430    Float_t GetMax() const;
    … …  
    2632    void Print(Option_t *opt=NULL) const;
    2733
    28     ClassDef(MCameraRecTemp, 1) // Storage Container for Receiver Board Temperature
     34    ClassDef(MCameraRecTemp, 2) // Storage Container for Receiver Board Temperature
    2935};
    3036

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

    r7681 r7726  
    2929// Display drive information
    3030//
     31// Class Version 2:
     32// ----------------
     33//
     34//  + TGraph fNumStarsCor; // Number of correlated stars identified by starguider
     35//
    3136////////////////////////////////////////////////////////////////////////////
    3237#include "MHPointing.h"
    … …  
    8691
    8792    // Init Graphs
    88     fDevTimeSG.SetNameTitle("DevSG",       "Absolute deviation of drive (black) and starguider (blue)");
    89     fDevTimeCosy.SetNameTitle("DevCosy",   "Cosy deviation");
    90     fBrightness.SetNameTitle("Brightness", "Arbitrary Sky Brightness (black), No. of stars identified by starguider (blue)");
    91     fNumStars.SetNameTitle("NumStars",     "Number of stars identified by starguider");
    92     fDevZd.SetNameTitle("DevZd",           "Starguider deviation Zd (blue), Az (black)");
    93     fDevAz.SetNameTitle("DevAz",           "Starguider Deviation Az");
    94     fPosZd.SetNameTitle("PosZd",           "Nominal position Zd");
     93    fDevTimeSG.SetNameTitle("DevSG",         "Absolute deviation of drive (black) and starguider (blue)");
     94    fDevTimeCosy.SetNameTitle("DevCosy",     "Cosy deviation");
     95    fBrightness.SetNameTitle("Brightness",   "Arbitrary Sky Brightness (black), No. of stars identified by starguider (blue)");
     96    fNumStars.SetNameTitle("NumStars",       "Number of stars identified by starguider");
     97    fNumStarsCor.SetNameTitle("NumStarsCor", "Number of stars correlated by starguider");
     98    fDevZd.SetNameTitle("DevZd",             "Starguider deviation Zd (blue), Az (black)");
     99    fDevAz.SetNameTitle("DevAz",             "Starguider Deviation Az");
     100    fPosZd.SetNameTitle("PosZd",             "Nominal position Zd");
    95101    //fPosAz.SetNameTitle("PosZd",          "Position Az");
    96102
    … …  
    99105    InitGraph(fBrightness);
    100106    InitGraph(fNumStars);
     107    InitGraph(fNumStarsCor);
    101108    InitGraph(fDevZd);
    102109    InitGraph(fDevAz);
    … …  
    108115    fBrightness.SetMinimum(0);
    109116    fNumStars.SetMinimum(0);
     117    fNumStarsCor.SetMinimum(0);
    110118
    111119    fDevTimeSG.SetMarkerColor(kBlue);
    112120    fDevZd.SetMarkerColor(kBlue);
    113121    fNumStars.SetMarkerColor(kBlue);
     122    fNumStarsCor.SetMarkerColor(kMagenta);
    114123    //fPosAz.SetMarkerColor(kBlue);
    115124}
    … …  
    170179        if (fReportSG->GetSkyBrightness()>0)
    171180        {
    172             AddPoint(fBrightness, tm, fReportSG->GetSkyBrightness());
    173             AddPoint(fNumStars,   tm, fReportSG->GetNumIdentifiedStars());
     181            AddPoint(fBrightness,  tm, fReportSG->GetSkyBrightness());
     182            AddPoint(fNumStars,    tm, fReportSG->GetNumIdentifiedStars());
     183            AddPoint(fNumStarsCor, tm, fReportSG->GetNumCorrelatedStars());
    174184        }
    175185
    … …  
    227237// Update position of an axis on the right side of the histogram
    228238//
    229 void MHPointing::UpdateRightAxis(TGraph &g) const
    230 {
    231     TH1 &h = *g.GetHistogram();
    232 
    233     const Double_t max = h.GetMaximum();
     239void MHPointing::UpdateRightAxis(TGraph &g1, TGraph &g2) const
     240{
     241    TH1 &h1 = *g1.GetHistogram();
     242    TH1 &h2 = *g2.GetHistogram();
     243
     244    const Double_t max = TMath::Max(h1.GetMaximum(), h2.GetMaximum());
    234245    if (max==0)
    235246        return;
    … …  
    239250        return;
    240251
    241     axis->SetX1(g.GetXaxis()->GetXmax());
    242     axis->SetX2(g.GetXaxis()->GetXmax());
     252    axis->SetX1(g1.GetXaxis()->GetXmax());
     253    axis->SetX2(g1.GetXaxis()->GetXmax());
    243254    axis->SetY1(gPad->GetUymin());
    244255    axis->SetY2(gPad->GetUymax());
    … …  
    292303    fBrightness.Draw("AP");
    293304    fNumStars.Draw("P");
     305    fNumStarsCor.Draw("P");
    294306    DrawRightAxis("N");
    295307
    … …  
    327339    {
    328340        fNumStars.GetHistogram()->GetYaxis()->SetTitleColor(kBlue);
    329         UpdateRightAxis(fNumStars);
     341        UpdateRightAxis(fNumStars, fNumStarsCor);
    330342    }
    331343/*

  • trunk/MagicSoft/Mars/mpointing/MHPointing.h

    r7211 r7726  
    2525
    2626    TGraph             fNumStars;    // Number of stars identified by starguider
     27    TGraph             fNumStarsCor; // Number of correlated stars identified by starguider
    2728
    2829    TGraph             fDevZd;       // Starguider deviation Zd
    … …  
    3637    void AddPoint(TGraph &g, Double_t x, Double_t y) const;
    3738    void DrawGraph(TGraph &g, const char *y=0) const;
    38     void UpdateRightAxis(TGraph &g) const;
     39    void UpdateRightAxis(TGraph &g1, TGraph &g2) const;
    3940    void DrawRightAxis(const char *title) const;
    4041
    … …  
    4849    void Paint(Option_t *opt="");
    4950
    50     ClassDef(MHPointing, 1) // Histogram to display tracking/pointing information
     51    ClassDef(MHPointing, 2) // Histogram to display tracking/pointing information
    5152};
    5253

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

    r7594 r7726  
    140140    {
    141141        fDeviation->SetDevZdAz(0, 0);
     142        fDeviation->SetDevXY(0, 0);   //?!?
    142143        fSkip[1]++;
    143144        return kTRUE;

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

    r7550 r7726  
    6464// (Zd/Az) coordinates.
    6565//
     66// Return angle [rad] in the range -pi, pi
     67//
    6668// For more information see MAstro::RotationAngle
    6769//
    … …  
    7678// seen with an Alt/Az telescope calculated from the stored sky
    7779// (Ra/Dec) coordinates.
     80//
     81// Return angle [rad] in the range -pi, pi
    7882//
    7983// For more information see MAstro::RotationAngle

  • trunk/MagicSoft/Mars/mreport/MReport.cc

    r7719 r7726  
    123123//    200510250  | 53801.5 | 53813.5 |  200603080
    124124//    200510250  | 53813.5 |         |  200603190
     125//    200604010  | 53863.5 |         |  200605080
    125126//
    126127Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver)
    … …  
    153154        ver=200603190;
    154155
     156    if (ver==200604010 && GetMjd()>53864.5)
     157        ver=200605080;
     158
    155159    // Interprete body (contents) of report
    156160    const Int_t rc = InterpreteBody(str, ver);

  • trunk/MagicSoft/Mars/mreport/MReportCC.cc

    r7723 r7726  
    261261            continue;
    262262
     263        if (n==0 && i==0)
     264        {
     265            *fLog << inf << "Receiver Board Temperatures empty." << endl;
     266            fRecTemp->Invalidate();
     267            break;
     268        }
     269
    263270        *fLog << warn << "WARNING - Reading Receiver Board Temperature information." << endl;
    264271        return kFALSE;
    … …  
    286293    if (str.BeginsWith("RECEIVERS-COM-ERROR"))
    287294    {
     295        *fLog << inf << "Receiver Com-error... threshold setting and receiver board temp. invalid." << endl;
    288296        fTD->Invalidate();
    289297        fTH->Invalidate();
     298        fRecTemp->Invalidate();
    290299        str.Remove(0, 19);
    291300    }
    … …  
    297306        if (!InterpreteTD(str, ver))
    298307            return kCONTINUE;
    299     }
    300 
    301     if (ver>=200510250)
    302         if (!InterpreteRecTemp(str))
    303             return kCONTINUE;
     308
     309        if (ver>=200510250)
     310            if (!InterpreteRecTemp(str))
     311                return kCONTINUE;
     312    }
    304313
    305314    if (str.Strip(TString::kBoth)!=(TString)"OVER")

  • trunk/MagicSoft/Mars/mreport/MReportStarguider.cc

    r7639 r7726  
    5858//  + Double_t fMjd;                // Modified Julian Date matching the nominal position
    5959//
     60//
     61// Class Version 3:
     62// ----------------
     63//  + UInt_t   fNumCorrelatedStars; // Number of correlated stars identified by starguider algorithm
     64//
    6065//////////////////////////////////////////////////////////////////////////////
    6166#include "MReportStarguider.h"
    … …  
    7378// Default constructor. Initialize identifier to "STARG-REPORT"
    7479//
    75 MReportStarguider::MReportStarguider() : MReport("STARG-REPORT"),
     80MReportStarguider::MReportStarguider() : MReport("STARG-REPORT")/*,
    7681    fDevAz(0), fDevZd(0), fNominalZd(0), fNominalAz(0),
    7782    fCameraCenterX(0), fCameraCenterY(0), fNumIdentifiedStars(0),
    78     fSkyBrightness(0)
     83    fNumCorrelatedStars(0), fSkyBrightness(0)*/
    7984{
    8085    fName  = "MReportStarguider";
    8186    fTitle = "Class for STARG-REPORT information (telescope mispointing)";
     87
     88    Clear();
     89}
     90
     91// --------------------------------------------------------------------------
     92//
     93// Interprete the body of the STARG-REPORT string
     94//
     95void MReportStarguider::Clear(Option_t *o)
     96{
     97    fDevAz              = 0;
     98    fDevZd              = 0;
     99
     100    fNominalZd          = 0;
     101    fNominalAz          = 0;
     102
     103    fCameraCenterX      = 0;
     104    fCameraCenterY      = 0;
     105
     106    fNumIdentifiedStars = 0;
     107    fNumCorrelatedStars = 0;
     108
     109    fSkyBrightness      = 0;
    82110}
    83111
    … …  
    146174    }
    147175
     176    if (ver>=200605080)
     177    {
     178        // For the momment this are only placeholders....
     179        fNumCorrelatedStars = fNumIdentifiedStars;
     180        n=sscanf(str.Data(), "%df %n", &fNumIdentifiedStars, &len);
     181        if (n!=1)
     182        {
     183            *fLog << warn << "WARNING - Not enough arguments." << endl;
     184            *fLog << str << endl;
     185            return kCONTINUE;
     186        }
     187
     188        str.Remove(0, len);
     189        str = str.Strip(TString::kBoth);
     190    }
     191
    148192    return str.IsNull() ? kTRUE : kCONTINUE;
    149193}

  • trunk/MagicSoft/Mars/mreport/MReportStarguider.h

    r7202 r7726  
    2323
    2424    UInt_t   fNumIdentifiedStars; // Number of stars identified by starguider algorithm
     25    UInt_t   fNumCorrelatedStars; // Number of correlated stars identified by starguider algorithm
    2526
    2627    Double_t fSkyBrightness;      // [au] Sky Brightness as calcualted from the CCD image
    … …  
    3132public:
    3233    MReportStarguider();
     34
     35    void Clear(Option_t *o="");
    3336
    3437    Double_t GetDevAz() const { return fDevAz; }
    … …  
    4649
    4750    UInt_t   GetNumIdentifiedStars() const { return fNumIdentifiedStars; }
     51    UInt_t   GetNumCorrelatedStars() const { return fNumCorrelatedStars; }
    4852
    4953    Double_t GetSkyBrightness() const { return fSkyBrightness; }
    … …  
    5256    void Print(Option_t *o="") const;
    5357
    54     ClassDef(MReportStarguider, 2) // Class for STARG-REPORT information
     58    ClassDef(MReportStarguider, 3) // Class for STARG-REPORT information
    5559};
    5660
Note: See TracChangeset for help on using the changeset viewer.