Ignore:
Timestamp:
01/14/04 09:09:04 (21 years ago)
Author:
wittek
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/manalysis
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    r2437 r2798  
    8585#include "MCerPhotEvt.h"
    8686
    87 #include "MPedestalCam.h"
    88 #include "MPedestalPix.h"
     87#include "MPedPhotCam.h"
     88#include "MPedPhotPix.h"
     89
    8990#include "MBlindPixels.h"
    9091
    … …  
    910911     }
    911912 
    912    fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
     913   fPed = (MPedPhotCam*)pList->FindObject("MPedPhotCam");
    913914   if (!fPed)
    914915     {
    915        *fLog << err << "MPedestalCam not found... aborting." << endl;
     916       *fLog << err << "MPedPhotCam not found... aborting." << endl;
    916917       return kFALSE;
    917918     }
    … …  
    10141015      continue;
    10151016
    1016     fEvt->AddPixel(i, 0.0, (*fPed)[i].GetPedestalRms());
     1017    fEvt->AddPixel(i, 0.0, (*fPed)[i].GetRms());
    10171018  }
    10181019
    … …  
    10381039  //  Int_t j = pix.GetPixId();
    10391040
    1040   //  MPedestalPix &ppix = fPed->operator[](j);
    1041   //  ppix.SetMeanRms(0.0);
     1041  //  MPedPhotPix &ppix = fPed->operator[](j);
     1042  //  ppix.SetRms(0.0);
    10421043  //}
    10431044  //$$$$$$$$$$$$$$$$$$$$$$$$$$
    … …  
    14041405    Double_t ratioArea = 1.0 / fCam->GetPixRatio(j);
    14051406
    1406     MPedestalPix &ppix = (*fPed)[j];
    1407     Double_t oldsigma = ppix.GetPedestalRms();
     1407    MPedPhotPix &ppix = (*fPed)[j];
     1408    Double_t oldsigma = ppix.GetRms();
    14081409    Double_t oldsigma2 = oldsigma*oldsigma;
    14091410
    … …  
    16021603
    16031604    Double_t newsigma = sqrt( oldsigma2 + addSig2 );
    1604     ppix.SetPedestalRms( newsigma );
     1605    ppix.SetRms( newsigma );
    16051606
    16061607    fHSigmaPedestal->Fill( oldsigma, newsigma );

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

    r2206 r2798  
    1616class MGeomCam;
    1717class MCerPhotEvt;
    18 class MPedestalCam;
     18class MPedPhotCam;
    1919class MMcEvt;
    2020class MSigmabar;
    … …  
    3232    MSigmabar      *fSigmabar;
    3333    MMcEvt         *fMcEvt;
    34     MPedestalCam   *fPed;
     34    MPedPhotCam   *fPed;
    3535    MBlindPixels   *fBlinds;
    3636

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

    r2255 r2798  
    8484#include "MCerPhotEvt.h"
    8585
    86 #include "MPedestalCam.h"
    87 #include "MPedestalPix.h"
     86#include "MPedPhotCam.h"
     87#include "MPedPhotPix.h"
     88
    8889#include "MBlindPixels.h"
    8990
    … …  
    197198     }
    198199 
    199    fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
     200   fPed = (MPedPhotCam*)pList->FindObject("MPedPhotCam");
    200201   if (!fPed)
    201202     {
    202        *fLog << err << "MPedestalCam not found... aborting." << endl;
     203       *fLog << err << "MPedPhotCam not found... aborting." << endl;
    203204       return kFALSE;
    204205     }
    … …  
    293294      continue;
    294295
    295     fEvt->AddPixel(i, 0.0, (*fPed)[i].GetPedestalRms());
     296    fEvt->AddPixel(i, 0.0, (*fPed)[i].GetRms());
    296297  }
    297298
    … …  
    316317  //  Int_t j = pix.GetPixId();
    317318
    318   //  MPedestalPix &ppix = fPed->operator[](j);
    319   //  ppix.SetMeanRms(0.0);
     319  //  MPedPhotPix &ppix = fPed->operator[](j);
     320  //  ppix.SetRms(0.0);
    320321  //}
    321322  //$$$$$$$$$$$$$$$$$$$$$$$$$$
    … …  
    543544    Double_t ratioArea = 1.0 / fCam->GetPixRatio(j);
    544545
    545     MPedestalPix &ppix = (*fPed)[j];
    546     Double_t oldsigma = ppix.GetPedestalRms();
     546    MPedPhotPix &ppix = (*fPed)[j];
     547    Double_t oldsigma = ppix.GetRms();
    547548    Double_t oldsigma2 = oldsigma*oldsigma;
    548549
    … …  
    706707
    707708    Double_t newsigma = sqrt(oldsigma2 + addSig2);
    708     ppix.SetPedestalRms(newsigma);
     709    ppix.SetRms(newsigma);
    709710
    710711    fHSigmaPedestal->Fill(oldsigma, newsigma);

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

    r2206 r2798  
    1616class MGeomCam;
    1717class MCerPhotEvt;
    18 class MPedestalCam;
     18class MPedPhotCam;
    1919class MMcEvt;
    2020class MSigmabar;
    … …  
    2929    MSigmabar      *fSigmabar;
    3030    MMcEvt         *fMcEvt;
    31     MPedestalCam   *fPed;
     31    MPedPhotCam   *fPed;
    3232    MBlindPixels   *fBlinds;
    3333

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

    r2777 r2798  
    7676#include "MCerPhotEvt.h"
    7777
    78 #include "MPedestalCam.h"
    79 #include "MPedestalPix.h"
     78#include "MPedPhotCam.h"
     79#include "MPedPhotPix.h"
     80
    8081#include "MBlindPixels.h"
    8182
    … …  
    14771478     }
    14781479 
    1479    fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
     1480   fPed = (MPedPhotCam*)pList->FindObject("MPedPhotCam");
    14801481   if (!fPed)
    14811482     {
    1482        *fLog << err << "MPad : MPedestalCam not found... aborting."
     1483       *fLog << err << "MPad : MPedPhotCam not found... aborting."
    14831484             << endl;
    14841485       return kFALSE;
    … …  
    16001601      continue;
    16011602
    1602     fEvt->AddPixel(i, 0.0, (*fPed)[i].GetPedestalRms());
     1603    fEvt->AddPixel(i, 0.0, (*fPed)[i].GetRms());
    16031604  }
    16041605
    … …  
    19891990    Double_t ratioArea = 1.0 / fCam->GetPixRatio(j);
    19901991
    1991     MPedestalPix &ppix = (*fPed)[j];
    1992     Double_t oldsigma_phot = ppix.GetPedestalRms();
     1992    MPedPhotPix &ppix = (*fPed)[j];
     1993    Double_t oldsigma_phot = ppix.GetRms();
    19931994    Double_t oldsigma = oldsigma_phot * fPEperPhoton;
    19941995    Double_t oldsigma2 = oldsigma*oldsigma;
    … …  
    21402141    Double_t newsigma = sqrt( oldsigma2 + addSig2 );
    21412142    Double_t newsigma_phot = newsigma / fPEperPhoton;
    2142     ppix.SetPedestalRms( newsigma_phot );
     2143    ppix.SetRms( newsigma_phot );
    21432144
    21442145    fHSigmaPedestal->Fill( oldsigma_phot, newsigma_phot );

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

    r2777 r2798  
    1616class MGeomCam;
    1717class MCerPhotEvt;
    18 class MPedestalCam;
     18class MPedPhotCam;
    1919class MMcEvt;
    2020class MSigmabar;
    … …  
    3232    MSigmabar      *fSigmabar;
    3333    MMcEvt         *fMcEvt;
    34     MPedestalCam   *fPed;
     34    MPedPhotCam    *fPed;
    3535    MBlindPixels   *fBlinds;
    3636

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

    r2206 r2798  
    9393#include "MCerPhotPix.h"
    9494
    95 #include "MPedestalCam.h"
    96 #include "MPedestalPix.h"
     95#include "MPedPhotCam.h"
     96#include "MPedPhotPix.h"
    9797
    9898ClassImp(MPadding);
    … …  
    239239     }
    240240 
    241    fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
     241   fPed = (MPedPhotCam*)pList->FindObject("MPedPhotCam");
    242242   if (!fPed)
    243243     {
    244        *fLog << err << dbginf << "MPedestalCam not found... aborting." << endl;
     244       *fLog << err << dbginf << "MPedPhotCam not found... aborting." << endl;
    245245       return kFALSE;
    246246     }
    … …  
    443443     pix.SetErrorPhot( newerror );
    444444
    445      MPedestalPix &ppix = (*fPed)[i];
    446 
    447      ppix.SetMeanRms(0);
    448 
    449      const Double_t oldsigma = ppix.GetMeanRms();
     445     MPedPhotPix &ppix = (*fPed)[i];
     446
     447     ppix.SetRms(0);
     448
     449     const Double_t oldsigma = ppix.GetRms();
    450450     const Double_t newsigma = sqrt( oldsigma*oldsigma + quadraticDiff*area );
    451      ppix.SetMeanRms( newsigma );
     451     ppix.SetRms( newsigma );
    452452
    453453     fHSigmaPedestal->Fill( oldsigma, newsigma );

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

    r2206 r2798  
    1010class MGeomCam;
    1111class MCerPhotEvt;
    12 class MPedestalCam;
     12class MPedPhotCam;
    1313class MMcEvt;
    14 class MPedestalCam;
    1514class MSigmabar;
    1615class MParList;
    … …  
    2322    MSigmabar    *fSigmabar;
    2423    MMcEvt       *fMcEvt;
    25     MPedestalCam *fPed;
     24    MPedPhotCam *fPed;
    2625
    2726    Int_t     fRunType;

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

    r2630 r2798  
    2121
    2222    //void SetMean(Float_t f) { fMean = f; }
    23     //void SetRms(Float_t f)  { fRms  = f; }
     23    void SetRms(Float_t f)  { fRms  = f; }
    2424    void Set(Float_t m, Float_t r) { fMean = m; fRms = r; }
    2525

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

    r2255 r2798  
    5050#include "MCerPhotPix.h"
    5151
    52 #include "MPedestalCam.h"
    53 #include "MPedestalPix.h"
     52#include "MPedPhotCam.h"
     53#include "MPedPhotPix.h"
    5454
    5555ClassImp(MSigmabar);
    … …  
    9595// determination of sector to which a respective pixel belongs
    9696//
    97 Float_t MSigmabar::Calc(const MGeomCam &geom, const MPedestalCam &ped,
     97Float_t MSigmabar::Calc(const MGeomCam &geom, const MPedPhotCam &ped,
    9898                        const MCerPhotEvt &evt)
    9999{
    … …  
    154154
    155155        // count only those pixels which have a sigma != 0.0
    156         const Float_t sigma = ped[idx].GetPedestalRms();
     156        const Float_t sigma = ped[idx].GetRms();
    157157
    158158        if ( sigma <= 0 )

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

    r2103 r2798  
    99class MParList;
    1010class MCerPhotEvt;
    11 class MPedestalCam;
     11class MPedPhotCam;
    1212
    1313class MSigmabar : public MParContainer
    … …  
    4444    //    void SetSigmabarOuter(Float_t f) { fSigmabarOuter = f; }   
    4545
    46     Float_t Calc(const MGeomCam &geom, const MPedestalCam &ped, const MCerPhotEvt &evt);
     46    Float_t Calc(const MGeomCam &geom, const MPedPhotCam &ped, const MCerPhotEvt &evt);
    4747     
    4848    ClassDef(MSigmabar, 1)  // Storage Container for Sigmabar

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

    r2470 r2798  
    3535//  Input Containers:
    3636//   MGeomCam
    37 //   MPedestalCam
     37//   MPedPhotCam
    3838//   MRawRunHeader
    3939//   MMcEvt  (FIXME: Must be replaced by a 'real-data' container)
    … …  
    5353
    5454#include "MGeomCam.h"
    55 #include "MPedestalCam.h"
     55#include "MPedPhotCam.h"
    5656
    5757#include "MSigmabar.h"
    … …  
    9090    }
    9191
    92     fPed = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     92    fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
    9393    if (!fPed)
    9494    {
    95         *fLog << err << "MPedestalCam not found... aborting." << endl;
     95        *fLog << err << "MPedPhotCam not found... aborting." << endl;
    9696        return kFALSE;
    9797    }

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

    r2209 r2798  
    1414#endif
    1515
    16 #ifndef MARS_MPedestalCam
    17 #include "MPedestalCam.h"
     16#ifndef MARS_MPedPhotCam
     17#include "MPedPhotCam.h"
    1818#endif
    1919
    … …  
    3636    MCerPhotEvt    *fEvt;
    3737    MGeomCam       *fCam;
    38     MPedestalCam   *fPed;
     38    MPedPhotCam   *fPed;
    3939    MRawRunHeader  *fRun;
    4040    MSigmabar      *fSig;
Note: See TracChangeset for help on using the changeset viewer.