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

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.