Changeset 2282 for trunk


Ignore:
Timestamp:
07/17/03 08:06:40 (21 years ago)
Author:
wittek
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2277 r2282  
    11                                                 -*-*- END OF LINE -*-*-
     2
     3 2003/07/14: Wolfgang Wittek
     4
     5    * mhist/MHOnSubtraction.[h,cc]
     6      - add member function GetSignificance()
     7
     8   * mhist/MHMatrix.cc
     9     - add MProgressBar in Fill()
     10
     11    * mmontecarlo/MMcEnergyEst.h
     12      - add member functions GetNumCoeffA()
     13                             GetNumCoeffB()
     14
     15    * mfilter/MCT1SelBasic.[h,cc]
     16      - remove runs 601, 613, 614 for MC gamma
     17
     18    * manalysis/MCT1SupercutsCalc.cc
     19      - remove bug (dd2)
     20      - set fMatrix = NULL in constructor
     21
     22    * mgeom.MGeomCamCT1Daniel.[h,cc]
     23      - new; Daniel's CT1 geometry
     24
     25    * mgeom/Makefile
     26            GeomLinkDef.h
     27
     28
    229
    330 2003/07/14: Oscarlanch

  • trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc

    r2272 r2282  
    158158
    159159    TArrayD lup(ncutpar,     par + k0);
    160     SetLengthUp(lup);
     160    fLengthUp = lup;
    161161    k0 += ncutpar;
    162162
    163163    TArrayD wup(ncutpar,     par + k0);
    164     SetWidthUp(wup);
     164    fWidthUp = wup;
    165165    k0 += ncutpar;
    166166
    167167    TArrayD dup(ncutpar,     par + k0);
    168     SetDistUp(dup);
     168    fDistUp = dup;
    169169    k0 += ncutpar;
    170170
    171171    TArrayD llo(ncutpar,     par + k0);
    172     SetLengthLo(llo);
     172    fLengthLo = llo;
    173173    k0 += ncutpar;
    174174
    175175    TArrayD wlo(ncutpar,     par + k0);
    176     SetWidthLo(wlo);
     176    fWidthLo = wlo;
    177177    k0 += ncutpar;
    178178
    179179    TArrayD dlo(ncutpar,     par + k0);
    180     SetDistLo(dlo);
     180    fDistLo = dlo;
    181181    k0 += ncutpar;
    182182
    183183    TArrayD aup(ncutpar,     par + k0);
    184     SetAsymUp(aup);
     184    fAsymUp = aup;
    185185    k0 += ncutpar;
    186186
    187187    TArrayD alo(ncutpar,     par + k0);
    188     SetAsymLo(alo);
     188    fAsymLo = alo;
    189189    k0 += ncutpar;
    190190
    191191    TArrayD alphaup(ncutpar, par + k0);
    192     SetAlphaUp(alphaup);
     192    fAlphaUp = alphaup;
    193193}
    194194
    … …  
    277277
    278278    InitParams();
     279
     280    fMatrix = NULL;
    279281}
    280282
    … …  
    423425
    424426    const Double_t dist2   = meanx*meanx + meany*meany;
    425     const Double_t dd2     = dist2*fMm2Deg;
    426427    const Double_t dist    = sqrt(dist2) * fMm2Deg;
     428    const Double_t dd2     = dist*dist;
     429
    427430
    428431    const Double_t dmls    = log(size) - kNomLogSize;

  • trunk/MagicSoft/Mars/mfilter/MFCT1SelBasic.cc

    r2206 r2282  
    3030//  This is a class to evaluate basic cuts
    3131//
    32 //  WHAT ARE THE BASIC CUTS?
    33 //
    3432//  to be called after the calibration (when the number of photons is
    3533//               available for all pixels)
    3634//
     35//  The basic cuts are :
     36//
     37//      remove bad runs
     38//      thetamin < theta < thetamax
     39//      software trigger fullfilled (with minimum no.of photons = minphotons)
     40//
     41//
    3742/////////////////////////////////////////////////////////////////////////////
    3843
    … …  
    4449
    4550#include "MCerPhotEvt.h"
    46 //nclude "MRawRunHeader.h"
     51#include "MRawRunHeader.h"
    4752
    4853#include "MGeomPix.h"
    … …  
    95100Int_t MFCT1SelBasic::PreProcess(MParList *pList)
    96101{
    97     /*
    98102    fRawRun = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
    99103    if (!fRawRun)
    … …  
    102106        return kFALSE;
    103107    }
    104     */
    105108
    106109    fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt");
    … …  
    148151// Evaluate basic cuts
    149152//
    150 // if cuts are fulfilled      : fResult = kTRUE;
    151 // if they are not fullfilled : fResult = kFALSE;
     153//     bad events    : fResult = kTRUE;
     154//     good events  : fResult = kFALSE;
    152155//
    153156Int_t MFCT1SelBasic::Process()
    … …  
    157160    fResult  = kFALSE;
    158161
     162    // remove bad runs for MC gammas
     163    if (fMcEvt->GetEnergy() == 0.0  &&  fMcEvt->GetImpact() == 0.0)
     164    {
     165      if (fRawRun->GetRunNumber() == 601  ||
     166          fRawRun->GetRunNumber() == 613  ||
     167          fRawRun->GetRunNumber() == 614    )
     168        return Set(1);
     169    }
     170
    159171    if (theta<fThetaMin)
    160         return Set(1);
     172        return Set(2);
    161173
    162174    if (theta>fThetaMax)
    163         return Set(2);
     175        return Set(3);
    164176
    165177    if (!SwTrigger())
    166         return Set(3);
     178        return Set(4);
    167179
    168180    fCut[0]++;
    … …  
    234246    *fLog << GetDescriptor() << " execution statistics:" << endl;
    235247    *fLog << dec << setfill(' ');
     248
    236249    *fLog << " " << setw(7) << fCut[1] << " (" << setw(3) ;
    237250    *fLog << (int)(fCut[1]*100/GetNumExecutions()) ;
    238     *fLog << "%) Evts skipped due to: Zenith angle < " << fThetaMin << endl;
     251    *fLog << "%) Evts skipped due to: bad run " << endl;
    239252
    240253    *fLog << " " << setw(7) << fCut[2] << " (" << setw(3) ;
    241254    *fLog << (int)(fCut[2]*100/GetNumExecutions()) ;
    242     *fLog << "%) Evts skipped due to: Zenith angle > " << fThetaMax << endl;
     255    *fLog << "%) Evts skipped due to: Zenith angle < " << fThetaMin << endl;
    243256
    244257    *fLog << " " << setw(7) << fCut[3] << " (" << setw(3) ;
    245258    *fLog << (int)(fCut[3]*100/GetNumExecutions()) ;
     259    *fLog << "%) Evts skipped due to: Zenith angle > " << fThetaMax << endl;
     260
     261    *fLog << " " << setw(7) << fCut[4] << " (" << setw(3) ;
     262    *fLog << (int)(fCut[4]*100/GetNumExecutions()) ;
    246263    *fLog << "%) Evts skipped due to: Software trigger not fullfilled" ;
    247264    *fLog << " (with fMinPhotons = " << fMinPhotons << ")" << endl;

  • trunk/MagicSoft/Mars/mfilter/MFCT1SelBasic.h

    r2206 r2282  
    1818class MCerPhotEvt;
    1919class MPedestalCam;
    20 //class MRawRunHeader;
     20class MRawRunHeader;
    2121
    2222class MFCT1SelBasic : public MFilter
    … …  
    2727    const MCerPhotEvt   *fEvt;      // Cerenkov Photon Event
    2828    //const MPedestalCam  *fPed;      // Pedestal information
    29     //const MRawRunHeader *fRawRun;
     29    const MRawRunHeader *fRawRun;
    3030
    3131    Float_t     fMinPhotons;
    … …  
    3333    Float_t     fThetaMax;
    3434
    35     Int_t       fCut[4];
     35    Int_t       fCut[5];
    3636
    3737    Bool_t      fResult;

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

    r2277 r2282  
    1010#pragma link C++ class MGeomCam+;
    1111#pragma link C++ class MGeomCamCT1+;
     12#pragma link C++ class MGeomCamCT1Daniel+;
    1213#pragma link C++ class MGeomCamMagic+;
    1314#pragma link C++ class MGeomCamMagicHG+;

  • trunk/MagicSoft/Mars/mgeom/Makefile

    r2277 r2282  
    3131           MGeomCam.cc \
    3232           MGeomCamCT1.cc \
     33           MGeomCamCT1Daniel.cc \
    3334           MGeomCamMagic.cc \
    3435           MGeomCamMagicHG.cc \

  • trunk/MagicSoft/Mars/mhist/MHMatrix.cc

    r2276 r2282  
    6565#include "MParList.h"
    6666#include "MTaskList.h"
     67#include "MProgressBar.h"
    6768
    6869#include "MData.h"
    … …  
    624625    tlist.AddToList(&fillh);
    625626
     627    MProgressBar bar;
    626628    MEvtLoop evtloop;
    627629    evtloop.SetParList(plist);
     630    evtloop.SetProgressBar(&bar);
    628631
    629632    if (!evtloop.Eventloop())

  • trunk/MagicSoft/Mars/mhist/MHOnSubtraction.cc

    r2177 r2282  
    14261426
    14271427
    1428 /*
     1428
    14291429
    14301430
    … …  
    16601660
    16611661
    1662 */
     1662
    16631663
    16641664
    … …  
    16781678  FitHistogram(*aHisto, sigLiMa, lowerBin, upperBin, (Float_t)3.5, kFALSE);
    16791679
    1680   if (sigLiMa < 3)
    1681     *fLog << err << "No significant excess (sigma=" << sigLiMa <<")!"<<endl;
     1680  //if (sigLiMa < 3)
     1681  //  *fLog << err << "No significant excess (sigma=" << sigLiMa <<")!"<<endl;
    16821682
    16831683  if (signalRegion!=0) {
    … …  
    16911691                gammaSignal, errorGammaSignal, off, errorOff,
    16921692                (Float_t)3.0, draw);
     1693
     1694  fSignificance = sigLiMa;
    16931695 
    16941696  *fLog << inf << "Signal is "

  • trunk/MagicSoft/Mars/mhist/MHOnSubtraction.h

    r2170 r2282  
    4848  Int_t fSigniPlotColor;
    4949
     50  Double_t fSignificance;
     51
    5052  Bool_t CalcAET(TH3D *histon, MParList *parlist, const Bool_t Draw);
    5153
    … …  
    7577
    7678  Double_t CalcSignificance(Double_t nOn, Double_t nOff, Double_t theta);
     79  Double_t GetSignificance()  { return fSignificance; };
    7780
    7881  void SetExpoSlope(Double_t slope) { fSlope = slope; }

  • trunk/MagicSoft/Mars/mmontecarlo/MMcEnergyEst.h

    r2173 r2282  
    4242  Int_t   GetNevents()        const {return fNevents;}
    4343
     44  Int_t   GetNumCoeffA()      const {return fA.GetSize(); }
     45  Int_t   GetNumCoeffB()      const {return fB.GetSize(); }
     46
    4447  Double_t GetCoeff(Int_t i) { return i<fA.GetSize()? fA[i] : fB[i-fA.GetSize()]; }
    4548
Note: See TracChangeset for help on using the changeset viewer.