Changeset 4457 for trunk


Ignore:
Timestamp:
08/04/04 11:37:56 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
15 added
12 deleted
4 edited

Legend:

Unmodified
Added
Removed

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

    r4446 r4457  
    3838#pragma link C++ class MEventRateCalc+;
    3939
    40 #pragma link C++ class MCT1PadSchweizer+;
    41 #pragma link C++ class MCT1PadONOFF+;
    4240#pragma link C++ class MPad+;
    43 
    44 #pragma link C++ class MCT1PointingCorrCalc+;
    4541
    4642#pragma link C++ class MParameterI+;
    … …  
    5147#pragma link C++ class MMcTriggerLvl2Calc+;
    5248
    53 #pragma link C++ class MCT1Supercuts+;
    54 #pragma link C++ class MCT1SupercutsCalc+;
    55 #pragma link C++ class MCT1FindSupercuts+;
    5649#pragma link C++ class MSupercuts+;
    5750#pragma link C++ class MSupercutsCalc+;

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r4446 r4457  
    4848           MSigmabarParam.cc \
    4949           MSigmabarCalc.cc \
    50            MCT1PadSchweizer.cc \
    51            MCT1PointingCorrCalc.cc \
    5250           MParameters.cc \
    5351           MMcTriggerLvl2.cc \
    5452           MMcTriggerLvl2Calc.cc \
    55            MCT1Supercuts.cc \
    56            MCT1SupercutsCalc.cc \
    57            MCT1FindSupercuts.cc \
    5853           MSupercuts.cc \
    5954           MSupercutsCalc.cc \
    … …  
    6156           MMinuitInterface.cc \
    6257           MFiltercutsCalc.cc \
    63            MCT1PadONOFF.cc  \
    6458           MPad.cc  \
    6559           MPedestalWorkaround.cc \

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

    r3568 r4457  
    1818!   Author(s): Thomas Bretz, 11/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2003
     20!   Copyright: MAGIC Software Development, 2000-2004
    2121!
    2222!
    … …  
    4242//    MMcTrig         mc data container for trigger information
    4343//    MSrcPosCam      source position in the camera
    44 //    MBlindPixels    Array holding blind pixels
     44//    MBadPixelsCam   Array holding blind pixels
    4545//
    4646/////////////////////////////////////////////////////////////////////////////
    … …  
    7474#include "MGeomCam.h"
    7575#include "MSrcPosCam.h"
    76 #include "MBlindPixels.h"
     76#include "MBadPixelsCam.h"
     77#include "MBadPixelsPix.h"
    7778
    7879#include "MRawRunHeader.h"
    … …  
    245246        {
    246247            *fLog << i << " ";
    247             fBlinds->SetPixelBlind(i);
     248            (*fBlinds)[i].SetUnsuitable(MBadPixelsPix::kUnreliableRun);
    248249        }
    249250    *fLog << endl;
    … …  
    255256        {
    256257            *fLog << i << " ";
    257             fBlinds->SetPixelBlind(i);
     258            (*fBlinds)[i].SetUnsuitable(MBadPixelsPix::kUnreliableRun);
    258259        }
    259260    *fLog << endl;
    … …  
    262263    fBlnd.Set(iMAXNUMPIX);
    263264    for (int i=0; i<iMAXNUMPIX; i++)
    264         fBlnd[i] = fBlinds->IsBlind(i) ? 1 : 0;
     265        fBlnd[i] = (*fBlinds)[i].IsBad() ? 1 : 0;
    265266
    266267    fBlinds->SetReadyToSave();
    … …  
    349350
    350351    // float   frms_pedsig_phot[iMAXNUMPIX];      // standard deviation of the calibrated signals from the pedestal run */
    351     fPedest->InitSize(iMAXNUMPIX);
     352    fPedest->Init(*fGeom);
    352353
    353354    fPedRMS.Set(iMAXNUMPIX);
    … …  
    775776    //  look for the pedestal class in the plist
    776777    //
    777     fBlinds = (MBlindPixels*)pList->FindCreateObj("MBlindPixels");
     778    fBlinds = (MBadPixelsCam*)pList->FindCreateObj("MBadPixelsCam");
    778779    if (!fBlinds)
    779780        return kFALSE;
    … …  
    818819    Rewind();
    819820
    820     fPedest->InitSize(iMAXNUMPIX);
     821    fPedest->Init(*fGeom);
    821822
    822823    return GetSelector() ? GetSelector()->CallPreProcess(pList) : kTRUE;
    … …  
    901902    fBlinds->Clear();
    902903    for (int i=0; i<iMAXNUMPIX; i++)
    903         if ( fBlnd[i]==1 )
    904         {
    905             fBlinds->SetPixelBlind(i);
    906         }
     904        if (fBlnd[i]==1)
     905            (*fBlinds)[i].SetUnsuitable(MBadPixelsPix::kUnreliableRun);
    907906
    908907    // reset pedestal RMS for this event

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

    r2781 r4457  
    2222class MCerPhotEvt;
    2323class MPedPhotCam;
    24 class MBlindPixels;
     24class MBadPixelsCam;
    2525class MRawRunHeader;
    2626class MTaskList;
    … …  
    4545    MMcTrig       *fMcTrig;  // mc data container for trigger information
    4646    MSrcPosCam    *fSrcPos;  // source position in the camera
    47     MBlindPixels *fBlinds;  // Array holding blind pixels
     47    MBadPixelsCam *fBlinds;  // Array holding blind pixels
    4848    MRawRunHeader *fRawRunHeader; // raw run header
    4949    MParList      *fParList;      // parameter list
Note: See TracChangeset for help on using the changeset viewer.