Changeset 4050 for trunk


Ignore:
Timestamp:
05/11/04 19:32:07 (20 years ago)
Author:
rico
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mtemp/mifae
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

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

    r4048 r4050  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2004/05/11: Javier Rico
     21   * programs/optimizeCuts.cc, programs/optimizecuts.datacard
     22     - added
    2023
    21 2004/05/11: Ester Aliu
     24   * programs/Makefile
     25     - include optimizeCuts
     26
     27   * programs/srcPos.cc, programs/srcpos.datacard
     28     - add reference rotation angle
     29
     30       
     31 2004/05/11: Ester Aliu
    2232   *  macros/signal.cc
    2333     - change some things
    … …  
    2737     - add <stdlib.h> library
    2838
    29 2004/05/11: Ester Aliu
     39 2004/05/11: Ester Aliu
    3040   * programs/makeHillas.cc, programs/makehillas.datacard
    3141     - add island calculations
    3242 
    33 2004/05/11: Javier Rico
     43 2004/05/11: Javier Rico
    3444   * programs/makeHillas.cc
    3545     - prevent it from bombing because of the mjobs

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

    r3984 r4050  
    180180  // de-rotate the source position
    181181  const MAstroSky2Local Observation(eventTime, *fObservatory);
    182   Double_t rotationAngle = Observation.RotationAngle(fRA,fDEC);
     182  const MAstroSky2Local RefObservation(fRefMJD, *fObservatory);
     183  Double_t rotationAngle = Observation.RotationAngle(fRA,fDEC)-RefObservation.RotationAngle(fRA,fDEC);
    183184 
    184185  Float_t c = TMath::Cos(rotationAngle);

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

    r3973 r4050  
    2727    TString     fDCAName;
    2828
    29     Double_t   fRA;         //  [rad] Right ascention
    30     Double_t   fDEC;        //  [rad] Declination
    31     UInt_t     fNEvts;      //  Number of events in file
    32     UInt_t     fFirstEvt;   //  Event index for first event in file
    33     MTime      fIniTime;    //  Run initial time
    34     MTime      fFinTime;    //  Run final time
    35     Double_t   fDeltaT;     //  DeltaT between two events
    36     UInt_t     fRunNumber;  //  Current run number
     29    Double_t   fRA;          //  [rad] Right ascention
     30    Double_t   fDEC;         //  [rad] Declination
     31    Double_t   fRefMJD;      //  [MJ date] reference time for rotation
     32    UInt_t     fNEvts;       //  Number of events in file
     33    UInt_t     fFirstEvt;    //  Event index for first event in file
     34    MTime      fIniTime;     //  Run initial time
     35    MTime      fFinTime;     //  Run final time
     36    Double_t   fDeltaT;      //  DeltaT between two events
     37    UInt_t     fRunNumber;   //  Current run number
    3738
    3839    Int_t PreProcess(MParList *plist);
    … …  
    4344               const char* name=NULL, const char* title=NULL);
    4445
    45     void SetRAandDEC(Double_t ra, Double_t dec) {fRA=ra;fDEC=dec;};
     46    void SetRAandDECandRefMJD(Double_t ra, Double_t dec, Double_t ref) {fRA=ra;fDEC=dec;fRefMJD=ref;}
    4647
    4748    ClassDef(MSrcRotate, 0) // task to rotate the position of the source as a function of Azimuth and Zenith angles

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

    r4036 r4050  
    1818include ../../../Makefile.conf.general
    1919
    20 PROGRAMS = makeHillas psffit falseSource srcPos
     20PROGRAMS = makeHillas psffit falseSource srcPos optimizeCuts
    2121SOLIB    = $(MARSSYS)/libmars.so
    2222

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

    r4044 r4050  
    11
    22// Maximun number of (data) events to be processed)
    3 NEVENTS 9999999
     3NEVENTS 10
    44
    55// data file directory

  • trunk/MagicSoft/Mars/mtemp/mifae/programs/srcPos.cc

    r3973 r4050  
    4444Float_t  xsrcpos=0.;
    4545Float_t  ysrcpos=0.;
     46Float_t  mjdpos=53050;
    4647Bool_t   kRotate=1;
    4748Bool_t   kSrcPolicy=kTRUE;
    … …  
    116117
    117118  MSrcRotate    srcrotate;
    118   srcrotate.SetRAandDEC(fRA,fDEC);
     119  srcrotate.SetRAandDECandRefMJD(fRA,fDEC,mjdpos);
    119120
    120121  MHillasSrcCalc csrc1;   
    … …  
    194195          ifun >> xsrcpos;
    195196          ifun >> ysrcpos;       
     197          ifun >> mjdpos;
    196198        }
    197199

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

    r3973 r4050  
    44
    55// Input file name pattern
    6 INPUTFILES  ./srposPrueba.root
     6INPUTFILES  /mnt/users/jrico/magic/mars/Mars_Standard02/mtemp/mifae/hillas/mrk20040215OnB.root
    77
    88// output file name
    9 OUTFILE  ./srposPrueba2.root
     9OUTFILE  ./srcPosPrueba.root
    1010
    11 // X and Y position of the source in degrees
    12 SRCPOS  0.2  -0.1
     11// X and Y position of the source in degrees for a MJ date (days) -important only in case of rotation
     12SRCPOS  0.21  0.176   53050.0773
    1313
    14 // Flag to determine wheter source position is absolute (0) or relative to previous position (1)
    15 SRCABS 1
     14// Flag to determine whether source position is absolute (0) or relative to previous position (1)
     15SRCABS 0
    1616
    1717// rotation flag:
    … …  
    2121
    2222// source coordinates (RA DEC in rads)
    23 SRCCOORDS 1.46 0.384
     23// SRCCOORDS 1.46 0.384 // (Crab)
     24SRCCOORDS 2.899 0.667   // (Mrk 421)
    2425
Note: See TracChangeset for help on using the changeset viewer.