Changeset 2595 for trunk/MagicSoft


Ignore:
Timestamp:
12/02/03 16:41:06 (21 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2594 r2595  
    44
    55                                                 -*-*- END OF LINE -*-*-
     6 2003/12/02: Abelardo Moralejo
     7
     8   * mimage/MStereoCalc.[h,cc]
     9     - changed names of variables (removed underscores). Use new
     10       function MTask::AddSerialNumber  (see below).
     11
    612 2003/12/02: Thomas Bretz
    713 
    … …  
    2026
    2127   * mbase/MTask.h:
    22      - added static member functions AddDerialNumber to simplify
     28     - added static member functions AddSerialNumber to simplify
    2329       using different Serial numbers.
    2430

  • trunk/MagicSoft/Mars/mimage/MStereoCalc.cc

    r2567 r2595  
    7575{
    7676    // necessary
    77     TString mcname = "MMcEvt;";
    78     mcname += fCT1_id;
    7977
    80     fmcevt1 = (MMcEvt*)pList->FindObject(mcname);
     78    fmcevt1 = (MMcEvt*)pList->FindObject(AddSerialNumber("MMcEvt",fCT1id));
    8179    if (!fmcevt1)
    8280    {
    83         *fLog << err << mcname << " not found... aborting." << endl;
     81        *fLog << err << "MMcEvt;" << fCT1id << " not found... aborting." << endl;
    8482        return kFALSE;
    8583    }
    8684
    8785    // necessary
    88     mcname = "MMcEvt;";
    89     mcname += fCT2_id;
    90 
    91     fmcevt2 = (MMcEvt*)pList->FindObject(mcname);
     86    fmcevt1 = (MMcEvt*)pList->FindObject(AddSerialNumber("MMcEvt",fCT2id));
    9287    if (!fmcevt2)
    9388    {
    94         *fLog << err << mcname << " not found... aborting." << endl;
     89      *fLog << err << "MMcEvt;" << fCT2id << " not found... aborting." << endl;
    9590        return kFALSE;
    9691    }
    … …  
    9893    // necessary
    9994    TString geomname = "MGeomCam;";
    100     geomname += fCT1_id;
     95    geomname += fCT1id;
    10196    fGeomCam1 = (MGeomCam*)pList->FindObject(geomname);
    10297    if (!fGeomCam1)
    … …  
    108103    // necessary
    109104    geomname = "MGeomCam;";
    110     geomname += fCT2_id;
     105    geomname += fCT2id;
    111106    fGeomCam2 = (MGeomCam*)pList->FindObject(geomname);
    112107    if (!fGeomCam2)
    … …  
    118113    // necessary
    119114    TString hillasname = "MHillas;";
    120     hillasname += fCT1_id;
     115    hillasname += fCT1id;
    121116    fHillas1 = (MHillas*)pList->FindObject(hillasname);
    122117    if (!fHillas1)
    … …  
    128123    // necessary
    129124    hillasname = "MHillas;";
    130     hillasname += fCT2_id;
     125    hillasname += fCT2id;
    131126    fHillas2 = (MHillas*)pList->FindObject(hillasname);
    132127    if (!fHillas2)
    … …  
    153148Int_t MStereoCalc::Process()
    154149{
    155     fStereoPar->Calc(*fHillas1, *fmcevt1, *fGeomCam1, fCT1_x, fCT1_y, *fHillas2, *fmcevt2, *fGeomCam2, fCT2_x, fCT2_y);
     150    fStereoPar->Calc(*fHillas1, *fmcevt1, *fGeomCam1, fCT1x, fCT1y, *fHillas2, *fmcevt2, *fGeomCam2, fCT2x, fCT2y);
    156151
    157152    return kTRUE;

  • trunk/MagicSoft/Mars/mimage/MStereoCalc.h

    r2567 r2595  
    3232    const MMcEvt      *fmcevt2;      //! input
    3333
    34     Int_t fCT1_id;   //!
    35     Int_t fCT2_id;   //! Identifiers of the two analyzed telescopes.
     34    Int_t fCT1id;   //!
     35    Int_t fCT2id;   //! Identifiers of the two analyzed telescopes.
    3636
    37     Float_t fCT1_x;   //!
    38     Float_t fCT1_y;   //! Position of first telescope
    39     Float_t fCT2_x;   //!
    40     Float_t fCT2_y;   //! Position of second telescope
     37    Float_t fCT1x;   //!
     38    Float_t fCT1y;   //! Position of first telescope
     39    Float_t fCT2x;   //!
     40    Float_t fCT2y;   //! Position of second telescope
    4141
    4242    MStereoPar   *fStereoPar;     //! output container to store result
    … …  
    5454    void SetNameStereoPar(const char *name) { fStereoParName = name; }
    5555
    56     void SetCTids(Int_t i, Int_t j) { fCT1_id = i; fCT2_id = j; }
    57     void SetCT1coor(Float_t x, Float_t y) { fCT1_x = x; fCT1_y = y; } // in m
    58     void SetCT2coor(Float_t x, Float_t y) { fCT2_x = x; fCT2_y = y; } // in m
     56    void SetCTids(Int_t i, Int_t j) { fCT1id = i; fCT2id = j; }
     57    void SetCT1coor(Float_t x, Float_t y) { fCT1x = x; fCT1y = y; } // in m
     58    void SetCT2coor(Float_t x, Float_t y) { fCT2x = x; fCT2y = y; } // in m
    5959
    6060    ClassDef(MStereoCalc, 0) // Task to calculate some shower parameters in stereo mode
Note: See TracChangeset for help on using the changeset viewer.