Ignore:
Timestamp:
03/22/01 12:24:47 (24 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mdatacheck
Files:
10 added
4 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h

    r666 r698  
    55#pragma link off all functions;
    66
     7#pragma link C++ class MHFadcCam;
     8#pragma link C++ class MHFadcPix;
     9#pragma link C++ class MHHillas;
     10
    711#pragma link C++ class MShowSpect;
    8 #pragma link C++ class MHistosAdc;
    9 #pragma link C++ class MFillAdcSpect;
     12
     13#pragma link C++ class MFillHFadc;
     14#pragma link C++ class MFillHHillas;
    1015
    1116#pragma link C++ class MDumpEvtHeader;

  • trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.h

    r666 r698  
    2626  Bool_t Process() ;
    2727 
    28   ClassDef(MDumpEvtHeader, 1)   // Class to dump the pixel ids of a raw evt to the screen
     28  ClassDef(MDumpEvtHeader, 0)   // Class to dump the pixel ids of a raw evt to the screen
    2929
    3030};

  • trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc

    r667 r698  
    2323} ;
    2424
    25 MGDisplayAdc::MGDisplayAdc ( MHistosAdc *histos,
     25MGDisplayAdc::MGDisplayAdc ( MHFadcCam *histos,
    2626                            const TGWindow *p, const TGWindow *main,
    2727                            UInt_t w, UInt_t h,
    … …  
    218218    //   Histogramms in there.
    219219    //
    220     //   In the class MHistosAdc are in fact two lists. One for the high and
     220    //   In the class MHFadcCam are in fact two lists. One for the high and
    221221    //   one for the low gain. Here we will use only the high gain list!!!
    222222    //   With some special options (settings in the gui) we will also be able
    … …  
    224224    //
    225225
    226     const Int_t nhi = fHists->GetHiEntries();
     226    const Int_t nhi = fHists->GetEntries();
    227227    for ( Int_t i=0 ; i < nhi; i++ ) {
    228228        fHistoList->AddEntry(fHists->GetHistHi(i)->GetName(), i+1) ;

  • trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.h

    r665 r698  
    1212#endif
    1313
    14 #ifndef MHISTOSADC_H
    15 #include "MHistosAdc.h"
     14#ifndef MHFADCCAM_H
     15#include "MHFadcCam.h"
    1616#endif
    1717
    … …  
    2424    private:
    2525       
    26         MHistosAdc *fHists;             // Pointer to Container with the histograms
     26        MHFadcCam *fHists;              // Pointer to Container with the histograms
    2727       
    2828        // Create a main frame with a number of different buttons.
    … …  
    7171        TCanvas *fCanvas;
    7272       
    73         MGDisplayAdc(MHistosAdc *fHists ,
     73        MGDisplayAdc(MHFadcCam *fHists ,
    7474                     const TGWindow *p, const TGWindow *main,
    7575                     UInt_t w, UInt_t h,

  • trunk/MagicSoft/Mars/mdatacheck/MShowSpect.cc

    r667 r698  
    3434  //   Do the preprocessing for MShowSpect
    3535  //
    36   //   Connects Histogramms in the MHistosAdc container as the input
     36  //   Connects Histogramms in the MHFadcCam container as the input
    3737  //
    3838
    39   fHists = (MHistosAdc*) pList->FindObject( fHistName );
     39  fHists = (MHFadcCam*) pList->FindObject( fHistName );
    4040 
    4141  if (!fHists)
    4242    {
    43         *fLog << dbginf << " Error: MHistosAdc '" << fHistName << "' not found!" << endl;
     43        *fLog << dbginf << " Error: MHFadcCam '" << fHistName << "' not found!" << endl;
    4444        return kFALSE;
    4545    }

  • trunk/MagicSoft/Mars/mdatacheck/MShowSpect.h

    r667 r698  
    1111
    1212class MGDisplayAdc;
    13 class MHistosAdc;
     13class MHFadcCam;
    1414class MParList ;
    1515
    … …  
    1919    char       fHistName[256] ;
    2020
    21     MHistosAdc *fHists;         // Pointer to Container with the histograms
     21    MHFadcCam *fHists;          // Pointer to Container with the histograms
    2222 
    2323 public:
    … …  
    2929     Bool_t PostProcess();
    3030
    31      ClassDef(MShowSpect, 1)    // Fill the raw ADC in the histograms
     31     ClassDef(MShowSpect, 0)    // Fill the raw ADC in the histograms
    3232};
    3333

  • trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.cc

    r667 r698  
    1515#include "MReadTree.h"
    1616#include "MDumpEvtHeader.h"
    17 #include "MFillAdcSpect.h"
     17#include "MFillHFadc.h"
    1818#include "MShowSpect.h"
    19 #include "MHistosAdc.h"
     19#include "MHFadcCam.h"
    2020
    2121MViewAdcSpectra::MViewAdcSpectra()
    … …  
    6565  plist.AddToList(&evttime);
    6666
    67   fHistosAdc= new MHistosAdc;
     67  fHistosAdc= new MHFadcCam;
    6868  plist.AddToList( fHistosAdc ) ;
    6969
    … …  
    8080  //  tasks->AddToList( dumpheader ) ;
    8181 
    82   MFillAdcSpect fillspect;
     82  MFillHFadc fillspect;
    8383  tasks.AddToList( &fillspect ) ;
    8484
    85   MShowSpect showspect( "MHistosAdc" ) ;
     85  MShowSpect showspect( "MHFadcCam" ) ;
    8686  tasks.AddToList( &showspect ) ;
    8787

  • trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.h

    r667 r698  
    66#endif
    77
    8 class MHistosAdc;
     8class MHFadcCam;
    99
    1010class MViewAdcSpectra {
    … …  
    1212 private:
    1313
    14      MHistosAdc *fHistosAdc;
     14     MHFadcCam *fHistosAdc;
    1515
    1616 public:

  • trunk/MagicSoft/Mars/mdatacheck/Makefile

    r665 r698  
    2222#  connect the include files defined in the config.mk file
    2323#
    24 INCLUDES = -I. -I../mbase -I../mraw
     24INCLUDES = -I. -I../mbase -I../mraw -I../manalysis
    2525
    2626#------------------------------------------------------------------------------
    … …  
    2929
    3030SRCFILES = MDumpEvtHeader.cc \
    31            MFillAdcSpect.cc \
     31           MFillHFadc.cc \
     32           MFillHHillas.cc \
    3233           MGDisplayAdc.cc \
    33            MHistosAdc.cc \
     34           MHFadcPix.cc \
     35           MHFadcCam.cc \
     36           MHHillas.cc \
    3437           MShowSpect.cc \
    3538           MViewAdcSpectra.cc
Note: See TracChangeset for help on using the changeset viewer.