Changeset 2152 for trunk/MagicSoft


Ignore:
Timestamp:
06/03/03 08:21:45 (21 years ago)
Author:
wittek
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r2150 r2152  
    11                                                 -*-*- END OF LINE -*-*-
     2
     3 2003/06/03: Wolfgang Wittek
     4
     5   * mfileio/MCT1ReadPreProc.[h,cc]
     6     - reset blind pixels for each event
     7       (because they may have been changed by the padding)
     8
     9   * macros/ONOFFCT1Analysis.C
     10     - will be the macro for the CT1 analysis using ON and OFF data
     11
     12   * manalysis/MPadONOFF.[h,cc]
     13     - new class
     14     - class for the padding of ON/OFF data
     15
     16   * manalysis/MPadSchweizer.[h,cc]
     17     - remove fBlinds->Clear() because the resetting of the
     18       blind pixels is now done in MCT1ReadPreProc
     19
     20
     21
    222 2003/06/02: Thomas Bretz
    323
  • trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

    r2147 r2152  
    4141#pragma link C++ class MPadding+;
    4242#pragma link C++ class MPadSchweizer+;
     43#pragma link C++ class MPadONOFF+;
    4344
    4445#pragma link C++ class MCT1PointingCorrCalc+;
     
    5455
    5556#endif
     57
  • trunk/MagicSoft/Mars/manalysis/MPadSchweizer.cc

    r2141 r2152  
    392392
    393393  hblind = fHBlindPixIdTheta->ProjectionY("", binPix, binPix, "");
    394   fBlinds->Clear();
    395394  if ( hblind->GetEntries() > 0.0 )
    396395    for (UInt_t i=0; i<numBlind; i++)
     
    774773
    775774    //---------------------------------------------------------------
    776     TCanvas &c = *(MH::MakeDefCanvas("PadSchweizer", "", 900, 900));
    777     c.Divide(3, 3);
     775    TCanvas &c = *(MH::MakeDefCanvas("PadSchweizer", "", 900, 1200));
     776    c.Divide(3, 4);
    778777    gROOT->SetSelectedPad(NULL);
    779778
     
    801800    fHSigmaTheta->DrawCopy();     
    802801    fHSigmaTheta->SetBit(kCanDelete);     
     802
     803    //--------------------------------------------------------------------
     804
     805
     806    c.cd(7);
     807    fHBlindPixNTheta->SetDirectory(NULL);
     808    fHBlindPixNTheta->SetTitle("(Input) 2D : no.of blind pixels, \\Theta");
     809    fHBlindPixNTheta->DrawCopy();     
     810    fHBlindPixNTheta->SetBit(kCanDelete);     
     811
     812    //--------------------------------------------------------------------
     813
     814
     815    c.cd(10);
     816    fHBlindPixIdTheta->SetDirectory(NULL);
     817    fHBlindPixIdTheta->SetTitle("(Input) 2D : blind pixel Id, \\Theta");
     818    fHBlindPixIdTheta->DrawCopy();     
     819    fHBlindPixIdTheta->SetBit(kCanDelete);     
    803820
    804821
  • trunk/MagicSoft/Mars/manalysis/Makefile

    r2147 r2152  
    2323#
    2424INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
    25            -I../mdata -I../mhist -I../mgui -I../mimage -I../mhistmc
     25           -I../mdata -I../mhist -I../mgui -I../mimage -I../mhistmc \
     26           -I../mfileio
     27
    2628
    2729#------------------------------------------------------------------------------
     
    5456           MPadding.cc \
    5557           MPadSchweizer.cc \
     58           MPadONOFF.cc \
    5659           MCT1PointingCorrCalc.cc \
    5760           MParameters.cc \
  • trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

    r2141 r2152  
    234234
    235235    // Boolean bdontusepix[iMAXNUMPIX]; // bdontusepix is set true if the pixel should not be used in image analysis, otherwise it is true;
     236
    236237    fBlinds->Clear();
    237238    *fLog << "Don't use pixels: ";
     
    245246
    246247    *fLog << "Exclude pixels: ";
    247 
    248248    // Boolean bexcludepix[iMAXNUMPIX];
    249249    for (int i=0; i<iMAXNUMPIX; i++)
     
    254254        }
    255255    *fLog << endl;
     256
     257    // save blind pixels for all events of this run
     258    fBlnd.Set(iMAXNUMPIX);
     259    for (int i=0; i<iMAXNUMPIX; i++)
     260    {
     261        if ( fBlinds->IsBlind(i) )
     262        {
     263          fBlnd[i] = 1;
     264        }
     265        else
     266        {
     267          fBlnd[i] = 0;
     268        }
     269    }
    256270
    257271    fBlinds->SetReadyToSave();
     
    881895    */
    882896
     897    // reset blind pixels for this event
     898    fBlinds->Clear();
     899    for (int i=0; i<iMAXNUMPIX; i++)
     900        if ( fBlnd[i]==1 )
     901        {
     902            fBlinds->SetPixelBlind(i);
     903        }
     904
     905    // reset pedestal RMS for this event
    883906    for (Int_t i=0; i<iMAXNUMPIX; i++)
    884907        (*fPedest)[i].SetMeanRms(fPedRMS[i]);
     
    11081131    struct eventrecord event;
    11091132
     1133
     1134
    11101135    // read the eventrecord from the file
    11111136    fIn->read((Byte_t*)&event, sizeof(struct eventrecord));
  • trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

    r2132 r2152  
    44#ifndef ROOT_TArrayF
    55#include <TArrayF.h>
     6#endif
     7
     8#ifndef ROOT_TArrayI
     9#include <TArrayI.h>
    610#endif
    711
     
    5862
    5963    TArrayF fPedRMS;
     64    TArrayI fBlnd;
    6065
    6166    Bool_t OpenNextFile();
Note: See TracChangeset for help on using the changeset viewer.