Changeset 3973 for trunk


Ignore:
Timestamp:
05/05/04 15:59:50 (20 years ago)
Author:
rico
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mtemp/mifae
Files:
8 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mtemp/mifae/Changelog

    r3965 r3973  
    2020
    2121 2004/05/03: Javier Rico
     22   * library/MSrcTranslate.[h,cc]
     23     - added
     24
     25   * library/Makefile, library/IFAELinkDef.h
     26     - add MSrcTranslate
     27
     28   * library/MSrcRotate.[h.cc]
     29     - adapted to changes in MObservatory and MAstro
     30   
     31   * programs/falseSource.cc programs/falsesource.datacard
     32     programs/srcPos.cc programs/srcpos.datacard
     33     - added
     34
     35   * programs/Makefile
     36     - add falseSource and srcPos
     37
     38   * macros/signal.C macros/signalPoint.C
     39     - added
     40       
     41 2004/05/03: Javier Rico
    2242   * makeHillas.cc
    2343     - put back Jobs for pedestal and calibration parts
    … …  
    2949   * library,programs,macros,*:
    3050     - new directories added
    31      - directory macros contains macros (.CC) and scripts (.sh)
     51     - directory macros contains macros (.C) and scripts (.sh)
    3252     - directory programs contains root compilables and associated
    3353       [input] files

  • trunk/MagicSoft/Mars/mtemp/mifae/library/IFAELinkDef.h

    r3947 r3973  
    99#pragma link C++ class MPSFFitCalc+;
    1010#pragma link C++ class MSrcPosFromFile+;
     11#pragma link C++ class MSrcRotate+;
     12#pragma link C++ class MSrcTranslate+;
    1113
    1214#endif

  • trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcRotate.cc

    r3947 r3973  
    4848#include "MDCA.h"
    4949
     50#include "MAstroSky2Local.h"
    5051#include "MObservatory.h"
    51 #include "MAstroSky2Local.h"
    52 #include "MAstro.h"
    5352
    5453#include "MLog.h"
    … …  
    9493        return kFALSE;
    9594    }
    96   fIniSrcPos = *fSrcPos;
    9795
    9896  // look for/create MDCA
    … …  
    181179 
    182180  // de-rotate the source position
    183   Double_t rotationAngle = fObservatory->RotationAngle(fRA,fDEC,eventTime);
     181  const MAstroSky2Local Observation(eventTime, *fObservatory);
     182  Double_t rotationAngle = Observation.RotationAngle(fRA,fDEC);
    184183 
    185184  Float_t c = TMath::Cos(rotationAngle);
    186185  Float_t s = TMath::Sin(rotationAngle);
    187186  // perform a rotation of -rotationAngle to move the source back to the "initial" position
    188   Float_t newX = c*fIniSrcPos.GetX()+s*fIniSrcPos.GetY();
    189   Float_t newY = -s*fIniSrcPos.GetX()+c*fIniSrcPos.GetY();
     187  Float_t newX = c*fSrcPos->GetX()+s*fSrcPos->GetY();
     188  Float_t newY = -s*fSrcPos->GetX()+c*fSrcPos->GetY();
    190189
    191190#ifdef DEBUG

  • trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcRotate.h

    r3947 r3973  
    2727    TString     fDCAName;
    2828
    29     MSrcPosCam fIniSrcPos;  //  Copy of the initial source position
    3029    Double_t   fRA;         //  [rad] Right ascention
    3130    Double_t   fDEC;        //  [rad] Declination

  • trunk/MagicSoft/Mars/mtemp/mifae/library/Makefile

    r3965 r3973  
    4949        MPSFFit.cc \
    5050        MPSFFitCalc.cc \
    51         MSrcPosFromFile.cc
    52 #       MSrcRotate.cc
     51        MSrcPosFromFile.cc \
     52        MSrcRotate.cc \
     53        MSrcTranslate.cc
    5354
    5455

  • trunk/MagicSoft/Mars/mtemp/mifae/programs/Makefile

    r3947 r3973  
    1818include ../../../Makefile.conf.general
    1919
    20 PROGRAMS = makeHillas psffit
     20PROGRAMS = makeHillas psffit falseSource srcPos
    2121SOLIB    = ../../../libmars.so
    2222

  • trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard

    r3965 r3973  
    11
    22// Maximun number of (data) events to be processed)
    3 NEVENTS 100
     3NEVENTS 9999999
    44
    55// data file directory
Note: See TracChangeset for help on using the changeset viewer.