Changeset 2781 for trunk


Ignore:
Timestamp:
01/13/04 13:22:38 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2780 r2781  
    5454   * mreport/MReportCurrents.cc, mreport/MReportDAQ.cc:
    5555     - removed some obsolete comments (these comments confused THtml)
     56
     57   * manalysis/MCameraData.[h,cc], mfileio/MCT1ReadAscii.[h,cc],
     58     mfileio/MCT1ReadPreProc.[h,cc], mfilter/MFCT1SelBasic.cc,
     59     mfilter/MFSelBasic.cc, mhist/MHCamera.cc, mhist/MHEvent.[h,cc],
     60     mimage/MImgCleanStd.[h,cc], mimage/MImgCleanTGB.[h,cc],
     61     mmain/MAnalysis.cc, mmain/MEventDisplay.cc:
     62     - replaced MPedestalCam by MPedPhotCam
     63     - removed some obsolete includes
    5664
    5765

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

    r2488 r2781  
    3838#include "MLogManip.h"
    3939
    40 #include "MPedestalCam.h"
    41 #include "MPedestalPix.h"
     40#include "MPedPhotCam.h"
     41#include "MPedPhotPix.h"
    4242
    4343#include "MSigmabar.h"
    … …  
    7777*/
    7878
    79 void MCameraData::Calc(const MCerPhotEvt &evt, const MPedestalCam &cam,
    80                       const MGeomCam &geom)
     79void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, const MPedPhotCam &cam,
     80                                    const MGeomCam &geom)
    8181{
    8282    const Int_t n = geom.GetNumPixels();
    … …  
    9999
    100100        const Int_t idx = pix.GetPixId();
    101         const Float_t noise = cam[idx].GetPedestalRms();
     101        const Float_t noise = cam[idx].GetRms();
    102102
    103103        if (noise<=0) // fData[idx]=0, fValidity[idx]=0
    … …  
    113113}
    114114
    115 void MCameraData::Calc(const MCerPhotEvt &evt, const MSigmabar &sgb,
    116                       const MGeomCam &geom)
     115void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, const MSigmabar &sgb,
     116                                    const MGeomCam &geom)
    117117{
    118     Calc(evt, sgb.GetSigmabarInner(), geom);
     118    CalcCleaningLevel(evt, sgb.GetSigmabarInner(), geom);
    119119}
    120120
    121 void MCameraData::Calc(const MCerPhotEvt &evt, Double_t noise,
    122                       const MGeomCam &geom)
     121void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, Double_t noise,
     122                                    const MGeomCam &geom)
    123123{
    124124    const Int_t n = geom.GetNumPixels();

  • trunk/MagicSoft/Mars/manalysis/MCameraData.h

    r2488 r2781  
    1515class MSigmabar;
    1616class MCerPhotEvt;
    17 class MPedestalCam;
     17class MPedPhotCam;
    1818
    1919class MCameraData : public MCamEvent
    … …  
    2929    UInt_t GetNumPixels() const { return fData.GetSize(); }
    3030
    31     void Calc(const MCerPhotEvt &evt, const MPedestalCam &fCam,
    32               const MGeomCam &geom);
    33     void Calc(const MCerPhotEvt &evt, const MSigmabar &sgb,
    34               const MGeomCam &geom);
    35     void Calc(const MCerPhotEvt &evt, Double_t noise,
    36               const MGeomCam &geom);
    37 
     31    void CalcCleaningLevel(const MCerPhotEvt &evt, const MPedPhotCam &fCam,
     32                           const MGeomCam &geom);
     33    void CalcCleaningLevel(const MCerPhotEvt &evt, const MSigmabar &sgb,
     34                           const MGeomCam &geom);
     35    void CalcCleaningLevel(const MCerPhotEvt &evt, Double_t noise,
     36                           const MGeomCam &geom);
     37/*
    3838    void Calc(const MCerPhotEvt &evt, const MGeomCam &geom)
    3939    {
    40         Calc(evt, 1, geom);
     40        CalcCleaningLevel(evt, 1, geom);
    4141    }
    42 
     42 */
    4343    const TArrayD &GetData() const { return fData; }
    4444    const TArrayC &GetValidity() const  { return fValidity; }

  • trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc

    r2239 r2781  
    5252#include "MCerPhotEvt.h"
    5353
    54 #include "MPedestalPix.h"
    55 #include "MPedestalCam.h"
     54#include "MPedPhotPix.h"
     55#include "MPedPhotCam.h"
    5656
    5757ClassImp(MCT1ReadAscii);
    … …  
    154154// them if they don't exist.
    155155//
    156 // Initialize the size of the MPedestalCam container to 127 pixels (CT1 camera)
     156// Initialize the size of the MPedPhotCam container to 127 pixels (CT1 camera)
    157157//
    158158Int_t MCT1ReadAscii::PreProcess(MParList *pList)
    … …  
    178178    //  look for the pedestal class in the plist
    179179    //
    180     fPedest = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
     180    fPedest = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam");
    181181    if (!fPedest)
    182182        return kFALSE;
    … …  
    210210        *fIn >> val;
    211211
    212         if (val > 0.0)
    213             (*fPedest)[i].SetPedestalRms(val);
     212        if (val>0)
     213            (*fPedest)[i].Set(0, val);
    214214    }
    215215}
    … …  
    221221void MCT1ReadAscii::ReadData()
    222222{
    223     /*
    224      //
    225      // clear the list of cerphot-events
    226      //
    227      fNphot->Clear();
    228      */
    229 
    230223    //
    231224    // five unsused numbers
    … …  
    242235    // too the list with it's id, number of photons and error
    243236    //
    244 //    fNphot->InitSize(127);
    245 
    246237    for (Int_t i = 0; i<127; i++ )
    247238    {
    … …  
    251242
    252243        if (nphot > 0.0)
    253             fNphot->AddPixel(i, nphot, (*fPedest)[i].GetPedestalRms());
     244            fNphot->AddPixel(i, nphot, (*fPedest)[i].GetRms());
    254245    }
    255246    fNphot->FixSize();
    … …  
    270261    // reading event data by the 'switch entry'.
    271262    // After reading it should set the InputStreamID correctly.
    272     // ( should use MPedestalCam )
     263    // (should use MPedPhotCam )
    273264    //
    274265 

  • trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.h

    r2206 r2781  
    88class TList;
    99class MCerPhotEvt;
    10 class MPedestalCam;
     10class MPedPhotCam;
    1111
    1212class MCT1ReadAscii : public MTask
    1313{
    1414private:
    15     ifstream     *fIn;          // the inputfile
    16     MCerPhotEvt  *fNphot;       // the data container for all data.
    17     MPedestalCam *fPedest;      // ct1 pedestals
    18     TList        *fFileNames;  // Array which stores the \0-terminated filenames
     15    ifstream    *fIn;        // the inputfile
     16    MCerPhotEvt *fNphot;     // the data container for all data.
     17    MPedPhotCam *fPedest;    // CT1 pedestals
     18    TList       *fFileNames; // Array which stores the \0-terminated filenames
    1919
    2020    Bool_t OpenNextFile();

  • trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

    r2653 r2781  
    3838//  Output Containers:
    3939//    MCerPhotEvt     the data container for all data.
    40 //    MPedestalCam    ct1 pedestals
     40//    MPedPhotCam     CT1 pedestals
    4141//    MMcEvt          monte carlo data container for MC files
    4242//    MMcTrig         mc data container for trigger information
    … …  
    6767#include "MCerPhotEvt.h"
    6868
    69 #include "MPedestalPix.h"
    70 #include "MPedestalCam.h"
     69#include "MPedPhotPix.h"
     70#include "MPedPhotCam.h"
    7171
    7272#include "MGeomCam.h"
    … …  
    355355    for (Int_t i=0; i<iMAXNUMPIX; i++)
    356356    {
    357         (*fPedest)[i].SetPedestalRms(outpars.frms_pedsig_phot[i]);
     357        (*fPedest)[i].Set(0, outpars.frms_pedsig_phot[i]);
    358358        *fLog << outpars.frms_pedsig_phot[i] << " ";
    359359        fPedRMS[i] = outpars.frms_pedsig_phot[i];
    … …  
    722722// them if they don't exist.
    723723//
    724 // Initialize the size of the MPedestalCam container to 127 pixels (CT1 camera)
     724// Initialize the size of the MPedPhotCam container to 127 pixels (CT1 camera)
    725725//
    726726Int_t MCT1ReadPreProc::PreProcess(MParList *pList)
    … …  
    754754    //  look for the pedestal class in the plist
    755755    //
    756     fPedest = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
     756    fPedest = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam");
    757757    if (!fPedest)
    758758        return kFALSE;
    … …  
    901901    // reset pedestal RMS for this event
    902902    for (Int_t i=0; i<iMAXNUMPIX; i++)
    903         (*fPedest)[i].SetPedestalRms(fPedRMS[i]);
     903        (*fPedest)[i].Set(0, fPedRMS[i]);
    904904
    905905    //  int   isecs_since_midday; // seconds passed since midday before sunset (JD of run start)
    … …  
    944944            continue;
    945945
    946         fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i],
    947                          (*fPedest)[i].GetPedestalRms());
     946        fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i], (*fPedest)[i].GetRms());
    948947    }
    949948    fNphot->FixSize();

  • trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

    r2296 r2781  
    2121class MSrcPosCam;
    2222class MCerPhotEvt;
    23 class MPedestalCam;
     23class MPedPhotCam;
    2424class MBlindPixels;
    2525class MRawRunHeader;
    … …  
    4040    MGeomCam      *fGeom;    // camera geometry
    4141    MCerPhotEvt   *fNphot;   // the data container for all data.
    42     MPedestalCam  *fPedest;  // ct1 pedestals
     42    MPedPhotCam   *fPedest;  // ct1 pedestals
    4343    MTime         *fTime;    // event time
    4444    MMcEvt        *fMcEvt;   // monte carlo data container for MC files

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

    r2282 r2781  
    5454#include "MGeomCam.h"
    5555
    56 #include "MPedestalPix.h"
    57 #include "MPedestalCam.h"
    58 
    5956#include "MLog.h"
    6057#include "MLogManip.h"
    … …  
    127124        return kFALSE;
    128125    }
    129 /*
    130     fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
    131     if (!fPed)
    132     {
    133         *fLog << dbginf << "MPedestalCam missing in Parameter List... aborting." << endl;
    134         return kFALSE;
    135     }
    136 */
     126
    137127    memset(fCut, 0, sizeof(fCut));
    138128

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

    r2663 r2781  
    5454#include "MGeomCam.h"
    5555
    56 #include "MPedestalPix.h"
    57 #include "MPedestalCam.h"
    58 
    5956#include "MLog.h"
    6057#include "MLogManip.h"
    … …  
    127124        return kFALSE;
    128125    }
    129 /*
    130     fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
    131     if (!fPed)
    132     {
    133         *fLog << dbginf << "MPedestalCam missing in Parameter List... aborting." << endl;
    134         return kFALSE;
    135     }
    136 */
     126
    137127    memset(fCut, 0, sizeof(fCut));
    138128

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

    r2762 r2781  
    6262#include "MGeomCam.h"
    6363
    64 #include "MCerPhotPix.h"
    65 #include "MCerPhotEvt.h"
    66 
    67 #include "MPedestalPix.h"
    68 #include "MPedestalCam.h"
    69 
    70 #include "MCurrents.h"
    7164#include "MCamEvent.h"
    72 
    73 #include "MImgCleanStd.h"
    7465
    7566

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

    r2754 r2781  
    5757#include "MParList.h"
    5858#include "MTaskList.h"
    59 #include "MPedestalCam.h"
    60 #include "MPedestalPix.h"
    6159#include "MParList.h"
    6260#include "MCerPhotEvt.h"

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

    r2754 r2781  
    1313class MMcEvt;
    1414class MCerPhotEvt;
    15 class MPedestalCam;
    1615class MImgCleanStd;
    1716class MCameraSignal;
    … …  
    3332    MMcEvt        *fMcEvt;         //!
    3433    MCerPhotEvt   *fCerPhotEvt;    //!
    35     MPedestalCam  *fPedestalCam;   //!
    3634    MImgCleanStd  *fImgCleanStd;   //!
    3735    MCameraSignal *fCamSignal;     //!

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

    r2670 r2781  
    274274#include "MCerPhotEvt.h"
    275275
    276 #include "MPedestalPix.h"
    277 #include "MPedestalCam.h"
    278 
    279276#include "MGGroupFrame.h" // MGGroupFrame
    280277
    … …  
    559556    else
    560557    {
    561         fPed = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     558        fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
    562559        if (!fPed)
    563560        {
    564             *fLog << dbginf << "MPedestalCam not found... aborting." << endl;
     561            *fLog << dbginf << "MPedPhotCam not found... aborting." << endl;
    565562            return kFALSE;
    566563        }
    … …  
    581578{
    582579    if (fSgb)
    583         fData->Calc(*fEvt, *fSgb, *fCam);
     580        fData->CalcCleaningLevel(*fEvt, *fSgb, *fCam);
    584581    else
    585         fData->Calc(*fEvt, *fPed, *fCam);
     582        fData->CalcCleaningLevel(*fEvt, *fPed, *fCam);
    586583
    587584#ifdef DEBUG

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

    r2488 r2781  
    1010class MCerPhotPix;
    1111class MCerPhotEvt;
    12 class MPedestalCam;
     12class MPedPhotCam;
    1313class MCameraData;
    1414
    … …  
    2424
    2525private:
    26     const MGeomCam     *fCam;  //!
    27           MCerPhotEvt  *fEvt;  //!
    28           MSigmabar    *fSgb;  //!
    29           MPedestalCam *fPed;  //!
    30           MCameraData  *fData; //!
     26    const MGeomCam    *fCam;  //!
     27          MCerPhotEvt *fEvt;  //!
     28          MSigmabar   *fSgb;  //!
     29          MPedPhotCam *fPed;  //!
     30          MCameraData *fData; //!
    3131
    3232    CleaningMethod_t fCleaningMethod;

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

    r2465 r2781  
    5959#include "MCerPhotEvt.h"
    6060
    61 #include "MPedestalPix.h"
    62 #include "MPedestalCam.h"
     61#include "MPedPhotPix.h"
     62#include "MPedPhotCam.h"
    6363
    6464#include "MGGroupFrame.h" // MGGroupFrame
    … …  
    223223    else
    224224    {
    225         fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
     225        fPed = (MPedPhotCam*)pList->FindObject("MPedPhotCam");
    226226        if (!fPed)
    227227        {
    228             *fLog << dbginf << "MPedestalCam not found... aborting." << endl;
     228            *fLog << dbginf << "MPedPhotCam not found... aborting." << endl;
    229229            return kFALSE;
    230230        }
    … …  
    257257        const Double_t factor     = fCam->GetPixRatio(idx);
    258258        const Double_t factorsqrt = fCam->GetPixRatioSqrt(idx);
    259         const Float_t  noise      = (*fPed)[idx].GetPedestalRms();
     259        const Float_t  noise      = (*fPed)[idx].GetRms();
    260260
    261261        if (entry * factorsqrt <= fCleanLvl2 * noise)

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

    r2296 r2781  
    1010class MCerPhotPix;
    1111class MCerPhotEvt;
    12 class MPedestalCam;
     12class MPedPhotCam;
    1313
    1414class MGGroupFrame;
    … …  
    2323
    2424private:
    25     const MGeomCam     *fCam;  //!
    26           MCerPhotEvt  *fEvt;  //!
    27           MSigmabar    *fSgb;  //!
    28           MPedestalCam *fPed;  //!
     25    const MGeomCam    *fCam;  //!
     26          MCerPhotEvt *fEvt;  //!
     27          MSigmabar   *fSgb;  //!
     28          MPedPhotCam *fPed;  //!
    2929
    3030    CleaningMethod_t fCleaningMethod;

  • trunk/MagicSoft/Mars/mmain/MAnalysis.cc

    r2498 r2781  
    125125#include "MTaskList.h"
    126126#include "MGeomCamMagic.h"
    127 #include "MPedestalCam.h"
    128127#include "MHHillas.h"
    129128#include "MHStarMap.h"

  • trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

    r2754 r2781  
    188188    MCerPhotCalc      *ncalc = new MCerPhotCalc;
    189189    MCerPhotAnal2     *nanal = new MCerPhotAnal2;
    190     MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt",  "MFillH1");
     190    MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt", "MFillH1");
    191191    MImgCleanStd      *clean = new MImgCleanStd;
    192     MFillH            *fill2 = new MFillH(evt2, "MCerPhotEvt",  "MFillH2");
    193     MFillH            *fill3 = new MFillH(evt3, "MPedestalCam", "MFillH3");
    194     MFillH            *fill4 = new MFillH(evt4, "MPedestalCam", "MFillH4");
    195     MFillH            *fill5 = new MFillH(evt5, "MCameraData",  "MFillH5");
    196     MFillH            *fill6 = new MFillH(evt6, "MCameraData",  "MFillH6");
     192    MFillH            *fill2 = new MFillH(evt2, "MCerPhotEvt", "MFillH2");
     193    MFillH            *fill3 = new MFillH(evt3, "MPedPhotCam", "MFillH3");
     194    MFillH            *fill4 = new MFillH(evt4, "MPedPhotCam", "MFillH4");
     195    MFillH            *fill5 = new MFillH(evt5, "MCameraData", "MFillH5");
     196    MFillH            *fill6 = new MFillH(evt6, "MCameraData", "MFillH6");
    197197    MBlindPixelCalc   *blind = new MBlindPixelCalc;
    198198    MHillasCalc       *hcalc = new MHillasCalc;
Note: See TracChangeset for help on using the changeset viewer.