Ignore:
Timestamp:
07/21/05 11:44:05 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mreport
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mreport/MReportCamera.cc

    r7188 r7202  
    477477    return kTRUE;
    478478}
     479
     480// --------------------------------------------------------------------------
     481//
     482// Interprete the CHTEMP part
     483//
     484Bool_t MReportCamera::InterpreteCHTEMP(TString &str)
     485{
     486    if (!CheckTag(str, "CHTEMP "))
     487        return kFALSE;
     488
     489    Int_t len, temp1, temp2, temp3;
     490    Int_t n=sscanf(str.Data(), " %d %d %d %n", &temp1, &temp2, &temp3, &len);
     491    if (n!=3)
     492    {
     493        *fLog << warn << "WARNING - Reading information of 'CHTEMP' section." << endl;
     494        return kFALSE;
     495    }
     496
     497    fAUX->fTempCountingHouse1 = temp1*0.01;
     498    fAUX->fTempCountingHouse2 = temp2*0.01;
     499    fAUX->fTempCountingHouse3 = temp3*0.01;
     500
     501    str.Remove(0, len);
     502    str=str.Strip(TString::kBoth);
     503
     504    return kTRUE;
     505}
     506
     507// --------------------------------------------------------------------------
     508//
     509// Interprete the HVFIL part
     510//
     511Bool_t MReportCamera::InterpreteHVFIL(TString &str)
     512{
     513    if (!CheckTag(str, "HVFIL "))
     514        return kFALSE;
     515
     516    str=str.Strip(TString::kBoth);
     517
     518    const Ssiz_t pos = str.First(' ');
     519    if (pos<0)
     520    {
     521        *fLog << warn << "WARNING - Reading information of 'HVFIL' section." << endl;
     522        return kFALSE;
     523    }
     524
     525    fHV->fFileName = str(0, pos);
     526
     527    str.Remove(0, pos);
     528    str=str.Strip(TString::kBoth);
     529
     530    return kTRUE;
     531}
     532
    479533// --------------------------------------------------------------------------
    480534//
     
    576630    }
    577631
     632    if (ver >= 200507190)
     633    {
     634        if (!InterpreteCHTEMP(str))
     635            return kCONTINUE;
     636        if (!InterpreteHVFIL(str))
     637            return kCONTINUE;
     638    }
     639
    578640    if (str!="OVER")
    579641    {
  • trunk/MagicSoft/Mars/mreport/MReportCamera.h

    r6963 r7202  
    4848    Bool_t InterpreteActiveLoad(TString &str);
    4949    Bool_t InterpreteCentralPix(TString &str);
     50    Bool_t InterpreteCHTEMP(TString &str);
     51    Bool_t InterpreteHVFIL(TString &str);
    5052
    5153    Int_t  InterpreteBody(TString &str, Int_t ver);
  • trunk/MagicSoft/Mars/mreport/MReportDrive.cc

    r7197 r7202  
    135135Double_t MReportDrive::GetAbsError() const
    136136{
     137    return MAstro::GetDevAbs(fNominalZd, fErrorZd, fErrorAz);
     138/*
    137139    // For the algorithm see also MReportStarguider
    138140    const Double_t pzd = fNominalZd*TMath::DegToRad();
     
    158160    //
    159161
    160     return acos(d)*TMath::RadToDeg();
     162    return acos(d)*TMath::RadToDeg();*/
    161163}
    162164
  • trunk/MagicSoft/Mars/mreport/MReportStarguider.cc

    r7197 r7202  
    3232// This is the place to get the azimuth-/zenith mispointing of the telescope
    3333// given by the starguider-camera.
     34//
     35//
     36// Starguider reports are available since 2004/11/17.
     37// The nomnial pointing position is available since 2005/03/22
     38// The sky brightness and the number of identified stars since 2005/03/17
    3439//
    3540//
     
    129134Double_t MReportStarguider::GetDevAbs() const
    130135{
    131     // For the algorithm see also MReportDrive
    132     const Double_t pzd = fNominalZd * TMath::DegToRad();
    133     const Double_t azd = fDevZd/60  * TMath::DegToRad();
    134     const Double_t aaz = fDevAz/60  * TMath::DegToRad();
     136    return MAstro::GetDevAbs(fNominalZd, fDevZd/60, fDevAz/60)*60;
     137    /*
     138     // For the algorithm see also MReportDrive
     139     const Double_t pzd = fNominalZd * TMath::DegToRad();
     140     const Double_t azd = fDevZd/60  * TMath::DegToRad();
     141     const Double_t aaz = fDevAz/60  * TMath::DegToRad();
    135142
    136     const double el = TMath::Pi()/2-pzd;
     143     const double el = TMath::Pi()/2-pzd;
    137144
    138     const double dphi2 = aaz/2.;
    139     const double cos2  = cos(dphi2)*cos(dphi2);
    140     const double sin2  = sin(dphi2)*sin(dphi2);
    141     const double d     = cos(azd)*cos2 - cos(2*el)*sin2;
     145     const double dphi2 = aaz/2.;
     146     const double cos2  = cos(dphi2)*cos(dphi2);
     147     const double sin2  = sin(dphi2)*sin(dphi2);
     148     const double d     = cos(azd)*cos2 - cos(2*el)*sin2;
    142149
    143     return acos(d)*TMath::RadToDeg()*60;
     150     return acos(d)*TMath::RadToDeg()*60;
     151     */
    144152}
    145153
  • trunk/MagicSoft/Mars/mreport/MReportStarguider.h

    r7197 r7202  
    44#ifndef MARS_MReport
    55#include "MReport.h"
     6#endif
     7
     8#ifndef ROOT_TVector2
     9#include <TVector2.h>
    610#endif
    711
     
    3135    Double_t GetDevZd() const { return fDevZd; }
    3236    Double_t GetDevAbs() const;
     37    TVector2 GetDev() const { return TVector2(fDevZd, fDevAz); }
    3338
    3439    Double_t GetNominalZd() const { return fNominalZd; }
    3540    Double_t GetNominalAz() const { return fNominalAz; }
     41    TVector2 GetNominalPos() const { return TVector2(fNominalZd, fNominalAz); }
    3642
    3743    Float_t  GetCameraCenterX() const { return fCameraCenterX; }
    3844    Float_t  GetCameraCenterY() const { return fCameraCenterY; }
     45    TVector2 GetCameraCenter() const { return TVector2(fCameraCenterX, fCameraCenterY); }
    3946
    4047    UInt_t   GetNumIdentifiedStars() const { return fNumIdentifiedStars; }
Note: See TracChangeset for help on using the changeset viewer.