Changeset 2283 for trunk


Ignore:
Timestamp:
07/17/03 17:41:32 (21 years ago)
Author:
blanch
Message:
*** empty log message ***
Location:
trunk/MagicSoft
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mgeom/GeomLinkDef.h

    r2282 r2283  
    77#pragma link C++ class MGeomPMT+;
    88#pragma link C++ class MGeomMirror+;
     9#pragma link C++ class MGeomCorsikaCT+;
    910#pragma link C++ class MGeomPix+;
    1011#pragma link C++ class MGeomCam+;

  • trunk/MagicSoft/Mars/mgeom/Makefile

    r2282 r2283  
    3737           MGeomCamECO1000.cc \
    3838           MGeomCamECO1000HG.cc \
     39           MGeomCorsikaCT.cc \
    3940           MGeomMirror.cc \
    4041           MGeomPMT.cc

  • trunk/MagicSoft/include-Classes/MMcFormat/MFadcDefine.h

    r636 r2283  
    4141// -->  The maximum number of FADC channels
    4242//      Most likely it will be always equal to CAMERA_PIXELS
    43 #define MFADC_CHANNELS  577
     43#define MFADC_CHANNELS  3500

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.cc

    r2173 r2283  
    3333//
    3434////////////////////////////////////////////////////////////////////////////
     35#include "MGeomCorsikaCT.h"
    3536#include "MMcCorsikaRunHeader.h"
    3637
    … …  
    4445//
    4546//
    46 MMcCorsikaRunHeader::MMcCorsikaRunHeader(const char *name, const char *title)
     47MMcCorsikaRunHeader::MMcCorsikaRunHeader(const char *name, const char *title,
     48                                         int NumCT)
    4749{
    4850    fName  = name  ? name  : "MMcCorsikaRunHeader";
    … …  
    7981    for (int i=0;i<4; i++)  fNFL[i] = 0;
    8082
     83    fViewconeAngles[0]=0.0;
     84    fViewconeAngles[1]=0.0;
     85
    8186    fWobbleMode=0;
    8287    fAtmosphericModel=0;
     88
     89    fNumCT=NumCT;
     90    for  (int i=0;i<NumCT;i++)
     91      fTelescopes[i]= new MGeomCorsikaCT;
     92
    8393}
    8494
    … …  
    109119                               const Float_t  catm[5],
    110120                               const Float_t  nfl[4],
     121                               const Float_t  viewcone[2],
    111122                               const Float_t  wobble,
    112123                               const Float_t  atmospher
    … …  
    143154    for (int i=0; i<4; i++)  fNFL[i] = nfl[i];
    144155
     156    fViewconeAngles[0]=viewcone[0];
     157    fViewconeAngles[1]=viewcone[1];
     158
    145159    fWobbleMode=wobble;
    146160    fAtmosphericModel=atmospher;
     161
     162}
     163
     164// -------------------------------------------------------------------------
     165//
     166// Fill C Telescope information in Corsika Run Header
     167//
     168void MMcCorsikaRunHeader::FillCT(Float_t ctx, Float_t cty, Float_t ctz,
     169                                 Float_t cttheta, Float_t ctphi,
     170                                 Float_t ctdiam, Float_t ctfocal,
     171                                 Int_t CTnum){
     172
     173  static_cast<MGeomCorsikaCT*>(fTelescopes.UncheckedAt(CTnum))
     174    ->Fill(ctx, cty, ctz, cttheta, ctphi, ctdiam, ctfocal);
    147175
    148176}
    … …  
    157185
    158186
    159 

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.h

    r1783 r2283  
    1010#endif
    1111
     12#ifndef ROOT_TObjArray
     13#include <TObjArray.h>
     14#endif
     15
     16class MGeomCorsikaCT;
    1217
    1318class MMcCorsikaRunHeader : public MParContainer
    … …  
    4348    Float_t fNFL[4];
    4449
     50    // (degrees) Inner and outer angles in Corsika's VIEWCONE option
     51    Float_t fViewconeAngles[2];
     52                                 
     53
    4554    Float_t fWobbleMode;     // Indicates wobble mode with which
    4655                             //  reflector has been run
    … …  
    4958                               // 1 = atm_90percent, 2 = atm_isothermal,
    5059                               // 3 = atm_corsika.
     60    UInt_t fNumCT;
     61    TObjArray fTelescopes;
    5162
    5263public:
    53     MMcCorsikaRunHeader(const char *name=NULL, const char *title=NULL);
     64    MMcCorsikaRunHeader(const char *name=NULL, const char *title=NULL,
     65                        int NumCT=1);
    5466
    5567    void Fill(const Float_t  runnumber,
    … …  
    7587              const Float_t  catm[5],
    7688              const Float_t  nfl[4],
     89              const Float_t  viewcone[2],
    7790              const Float_t  wobble,
    7891              const Float_t  atmospher
    … …  
    8396    Float_t GetSlopeSpec() const { return fSlopeSpec; }
    8497
    85     ClassDef(MMcCorsikaRunHeader, 2) // storage container for corsika setup information
     98    void FillCT(Float_t ctx, Float_t cty, Float_t ctz,
     99                Float_t cttheta, Float_t ctphi,
     100                Float_t ctdiam, Float_t ctfocal,
     101                Int_t CTnum);
     102
     103    ClassDef(MMcCorsikaRunHeader, 3) // storage container for corsika setup information
    86104};
    87105#endif

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.cxx

    r2173 r2283  
    3232  fAmplFadc=MFADC_RESPONSE_AMPLITUDE;
    3333  fFwhmFadc=MFADC_RESPONSE_FWHM;
     34  fAmplFadcOuter=MFADC_RESPONSE_AMPLITUDE;
     35  fFwhmFadcOuter=MFADC_RESPONSE_FWHM;
    3436
    3537  for(i=0;i<MFADC_CHANNELS;i++){
    … …  
    5355  cout << "Monte Carlo Fadc output:" << endl;
    5456  cout << " Shape type of the signal: "       << fFadcShape << endl;
    55   cout << " Amplitude of the trigger in mV: " << fAmplFadc << endl;
     57  cout << " FADC integral for sphe [counts*ns]: " << fAmplFadc << endl;
    5658  cout << " Width of the signal in nsec: "    << fFwhmFadc << endl;
     59  cout << " Outer FADC integral for sphe [counts*ns]: " << fAmplFadcOuter
     60       << endl;
     61  cout << " Width of the signal in nsec for outer: "    << fFwhmFadcOuter
     62       << endl;
    5763  cout << " Pedestals and ElecNoise in fadc counts: " << endl;
    5864  for (int i=0;i<MFADC_CHANNELS;i++){

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx

    r1101 r2283  
    1414                            // the signal   
    1515                            // = 0 --> a gaussian 
    16   Float_t  fAmplFadc    ;   // the amplitude of the trigger in mV
     16  Float_t  fAmplFadc    ;   // the integral of sph response [counts*ns]
    1717  Float_t  fFwhmFadc    ;   // the width of the signal in nsec
     18  Float_t  fAmplFadcOuter;  // the integral of sph response [counts*ns], outer
     19  Float_t  fFwhmFadcOuter;  // the width of the signal in nsec, outer
    1820  Float_t  fPedesMean[MFADC_CHANNELS]    ;  //  The mean value for the pedestal
    1921                                            //  of each pixel (channel)
    … …  
    2123                                           //  due to the electronics for
    2224                                           //  each pixel (channel)
     25  Float_t fLow2HighGain;    // low gain factor
    2326
    2427 public:
    … …  
    3336  }
    3437
    35   void SetAmplitud(Float_t amp){
     38  void SetLow2High(Float_t l2h){
     39    fLow2HighGain=l2h;
     40  }
     41
     42  void SetAmplitud(Float_t amp, Float_t ampout=0.0){
    3643    fAmplFadc=amp;
     44    fAmplFadcOuter=ampout;
    3745 }
    3846
    39   void SetFwhm(Float_t fwhm){
     47  void SetFwhm(Float_t fwhm, Float_t fwhmout=0.0){
    4048    fFwhmFadc=fwhm;
     49    fFwhmFadcOuter=fwhmout;
    4150  }
    4251
    … …  
    5766  UInt_t GetNumPixel() const { return MFADC_CHANNELS; }
    5867
    59   ClassDef(MMcFadcHeader, 1)  //Stores Montecarlo Information describing the FADC behaviour
     68  ClassDef(MMcFadcHeader, 2)  //Stores Montecarlo Information describing the FADC behaviour
    6069
    6170};

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcRunHeader.cxx

    r2173 r2283  
    180180                        const Float_t  shphimax,
    181181                        const Float_t  shphimin,
     182                        const Float_t  impactmax,
    182183                        const Float_t  cwavelower,
    183184                        const Float_t  cwaveupper,
    … …  
    223224    fShowerPhiMin = shphimin;
    224225
     226    fImpactMax=impactmax;
     227
    225228    fCWaveLower = cwavelower;
    226229    fCWaveUpper = cwaveupper;

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcRunHeader.hxx

    r1983 r2283  
    3333  UInt_t  fNumSimulatedShowers; // Number of showers that were simualted
    3434  UInt_t  fNumStoredShowers;    // Number of store showers in this run
     35  UInt_t  fNumEvents;           // Number of events in this root file
    3536 
    3637  //  Coordinates of the Starfield
    … …  
    6061  Float_t fShowerPhiMax; // [deg] See note in class description.
    6162  Float_t fShowerPhiMin; // [deg] See note in class description.
     63
     64  //  Maximum impact parameter in the input rfl file
     65  Float_t fImpactMax; // [cm]
    6266
    6367  UShort_t fCorsikaVersion;
    … …  
    125129            const Float_t  shphimax,
    126130            const Float_t  shphimin,
     131            const Float_t  impactmax,
    127132            const Float_t  cwavelower,
    128133            const Float_t  cwaveupper,
    … …  
    146151  UInt_t   GetCorsikaVersion() const      { return fCorsikaVersion; }
    147152  Bool_t   GetAllEvtsTriggered() const    { return fAllEvtsTriggered ? kTRUE : kFALSE; }
     153  Float_t GetImpactMax() const            {return fImpactMax;}
    148154
    149   ClassDef(MMcRunHeader, 3)     // storage container for general run info
     155  ClassDef(MMcRunHeader, 4)     // storage container for general run info
    150156};
    151157#endif

  • trunk/MagicSoft/include-Classes/MMcFormat/MTriggerDefine.h

    r1248 r2283  
    44//
    55//
    6 #define TRIGGER_PIXELS        397
     6#define TRIGGER_PIXELS        3500
    77//
    88//      This is the number of Pixels contributing to the TRIGGER logic

  • trunk/MagicSoft/include-Classes/MMcFormat/Mdefine.h

    r525 r2283  
    77//     Number of the Pixels in the Camera
    88
    9 #define     CAMERA_PIXELS         577
     9#define     CAMERA_PIXELS         3500
    1010
    1111//     Number of the Slices of one Fadc. Be carefull this is the number of
Note: See TracChangeset for help on using the changeset viewer.