Changeset 2798


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

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2797 r2798  
    44
    55                                                 -*-*- END OF LINE -*-*-
     6
     7
     8 2004/01/14: Wolfgang Wittek
     9
     10   * macros/ONOFFAnalysis.C
     11     - current version
     12
     13   * mhist/MHSigmaTheta.[h,cc]
     14     - replace MPedestalCam by MPedPhotCam
     15
     16   * manalysis/MPad.[h,cc]
     17               MSigmabar.[h,cc]
     18               MSigmabarCalc.[h,cc]
     19               MCT1PadONOFF.[h,cc]
     20               MCT1PadSchweizer.[h,cc]
     21               MPadding.[h,cc]
     22     - replace MPedestalCam by MPedPhotCam
     23
     24   * manalysis/MPedPhotPix.[h,cc]
     25     - uncomment SetRms()
     26
     27
    628 2004/01/13: Markus Gaug
    729 

  • trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C

    r2777 r2798  
    197197
    198198    // Job A :
    199     //  - produce MHSigmaTheta plots for ON and OFF data
     199    //  - produce MHSigmaTheta plots for ON, OFF and MC data
    200200    //  - write out (or read in) these MHSigmaTheta plots
    201201    //  - read ON (or OFF or MC) data
    … …  
    289289  // Job A
    290290  //=========
    291     // read ON data file
    292 
    293     //  - produce the 2D-histogram "sigmabar versus Theta"
    294     //    (SigmaTheta_ON.root) for ON data
    295     //    (to be used for the padding of the MC gamma data)
    296 
    297     //  - write a file of ON events (ON1.root)
     291
     292    //  - produce the histograms "sigmabar versus Theta", etc.
     293    //    for ON, OFF and MC data (to be used for the padding)
     294    //
     295    //  - write root file of padded ON (OFF, MC) events (ON1.root, ...)
    298296    //    (after the standard cuts, before the g/h separation)
    299     //    (to be used together with the corresponding MC gamma file (MC1.root)
    300     //     for the optimization of the g/h separation)
    301297
    302298
    … …  
    304300 {
    305301    gLog << "=====================================================" << endl;
    306     gLog << "Macro MagicAnalysis : Start of Job A" << endl;
     302    gLog << "Macro ONOFFAnalysis : Start of Job A" << endl;
    307303    gLog << "" << endl;
    308     gLog << "Macro MagicAnalysis : JobA, WPad, RPad, Wout = "
     304    gLog << "Macro ONOFFAnalysis : JobA, WPad, RPad, Wout = "
    309305         << (JobA ? "kTRUE" : "kFALSE")  << ",  "
    310306         << (WPad ? "kTRUE" : "kFALSE")  << ",  "
    … …  
    318314    TString fileON  = onfile;
    319315    TString fileOFF = offfile;
    320     gLog << "fileON, fileOFF = " << fileON << ",  " << fileOFF << endl;
     316    TString fileMC  = mcfile;
     317    gLog << "fileON, fileOFF, fileMC = " << fileON << ",  "
     318         << fileOFF << ",  " << fileMC   << endl;
    321319
    322320    // name of file to conatin the histograms for the padding
    … …  
    353351    // generate histograms to be used in the padding
    354352    //
    355     // read ON and OFF data files
     353    // read ON, OFF and MC data files
    356354    // generate (or read in) the padding histograms for ON and OFF data
    357355    //                       and merge these histograms
    … …  
    526524
    527525      //-----------------------------------------
     526      // MC events
     527
     528      gLog << "------------" << endl;
     529      gLog << "MC events :" << endl;
     530      gLog << "------------" << endl;
     531
     532      MTaskList tlistmc;
     533      MParList plistmc;
     534
     535    MReadMarsFile  readMC("Events", fileMC);
     536    read.DisableAutoScheme();
     537    //      MCT1ReadPreProc readMC(fileMC);
     538
     539      MFSelBasic selthetamc;
     540      selthetamc.SetCuts(-100.0, 29.5, 35.5);
     541      MContinue contthetamc(&selthetamc);
     542
     543      MBlindPixelCalc blindmc;
     544      blindmc.SetUseBlindPixels();
     545
     546      MFSelBasic selbasicmc;
     547      MContinue contbasicmc(&selbasicmc);
     548
     549      MHBlindPixels blindMC("BlindPixelsMC");
     550      MFillH fillblindMC("BlindPixelsMC[MHBlindPixels]", "MBlindPixels");
     551      fillblindMC.SetName("FillBlindMC");
     552
     553      MSigmabarCalc sigbarcalcmc;
     554
     555      MHSigmaTheta sigthMC("SigmaThetaMC");
     556      MFillH fillsigthetaMC ("SigmaThetaMC[MHSigmaTheta]", "MMcEvt");
     557      fillsigthetaMC.SetName("FillSigThetaMC");     
     558
     559      //*****************************
     560      // entries in MParList
     561   
     562      plistmc.AddToList(&tlistmc);
     563      InitBinnings(&plistmc);
     564      plistmc.AddToList(&blindMC);
     565      plistmc.AddToList(&sigthMC);
     566
     567
     568      //*****************************
     569      // entries in MTaskList
     570   
     571      tlistmc.AddToList(&readMC);
     572      //tlistmc.AddToList(&contthetamc);
     573
     574      tlistmc.AddToList(&blindmc);
     575
     576      tlistmc.AddToList(&contbasicmc);
     577      tlistmc.AddToList(&fillblindMC);
     578      tlistmc.AddToList(&sigbarcalcmc);
     579      tlistmc.AddToList(&fillsigthetaMC);
     580
     581      MProgressBar barmc;
     582      MEvtLoop evtloopmc;
     583      evtloopmc.SetParList(&plistmc);
     584      evtloopmc.SetProgressBar(&barmc);
     585
     586      Int_t maxeventsmc = -1;
     587      //Int_t maxeventsmc = 20000;
     588      if ( !evtloopmc.Eventloop(maxeventsmc) )
     589          return;
     590
     591      tlistmc.PrintStatistics(0, kTRUE);
     592
     593      blindMC.DrawClone();
     594      sigthMC.DrawClone();
     595
     596      // save the histograms for the padding
     597      TH2D *sigthmc     = sigthMC.GetSigmaTheta();
     598      TH3D *sigpixthmc  = sigthMC.GetSigmaPixTheta();
     599      TH3D *diffpixthmc = sigthMC.GetDiffPixTheta();
     600
     601      TH2D *blindidthmc = blindMC.GetBlindId();
     602      TH2D *blindnthmc  = blindMC.GetBlindN();
     603
     604
     605      //-----------------------------------------
    528606
    529607      gLog << "End of generating the padding histograms" << endl;
    … …  
    762840
    763841
    764     gLog << "Macro MagicAnalysis : End of Job A" << endl;
     842    gLog << "Macro ONOFFAnalysis : End of Job A" << endl;
    765843    gLog << "===================================================" << endl;
    766844 }
    … …  
    786864 {
    787865    gLog << "=====================================================" << endl;
    788     gLog << "Macro MagicAnalysis : Start of Job B_RF_UP" << endl;
     866    gLog << "Macro ONOFFAnalysis : Start of Job B_RF_UP" << endl;
    789867
    790868    gLog << "" << endl;
    791     gLog << "Macro MagicAnalysis : JobB_RF_UP, RTrainRF, CTrainRF, RTree, WRF = "
     869    gLog << "Macro ONOFFAnalysis : JobB_RF_UP, RTrainRF, CTrainRF, RTree, WRF = "
    792870         << (JobB_RF_UP ? "kTRUE" : "kFALSE")  << ",  "
    793871         << (RTrainRF ?   "kTRUE" : "kFALSE")  << ",  "
    … …  
    12901368
    12911369      gLog << "" << endl;
    1292       gLog << "Macro MagicAnalysis : matrix of training events for gammas written onto file "
     1370      gLog << "Macro ONOFFAnalysis : matrix of training events for gammas written onto file "
    12931371           << NameGammas << endl;
    12941372
    … …  
    13021380
    13031381      gLog << "" << endl;
    1304       gLog << "Macro MagicAnalysis : matrix of training events for hadrons written onto file "
     1382      gLog << "Macro ONOFFAnalysis : matrix of training events for hadrons written onto file "
    13051383           << NameHadrons << endl;
    13061384
    … …  
    13691447    gLog << "" << endl;
    13701448    gLog << "========================================================" << endl;
    1371     gLog << "Macro MagicAnalysis : start growing trees" << endl;
     1449    gLog << "Macro ONOFFAnalysis : start growing trees" << endl;
    13721450
    13731451    MTaskList tlist2;
    … …  
    16541732  }
    16551733
    1656     gLog << "Macro MagicAnalysis : End of Job B_RF_UP" << endl;
     1734    gLog << "Macro ONOFFAnalysis : End of Job B_RF_UP" << endl;
    16571735    gLog << "=======================================================" << endl;
    16581736 }
    … …  
    16741752 {
    16751753    gLog << "=====================================================" << endl;
    1676     gLog << "Macro MagicAnalysis : Start of Job B_SC_UP" << endl;
     1754    gLog << "Macro ONOFFAnalysis : Start of Job B_SC_UP" << endl;
    16771755
    16781756    gLog << "" << endl;
    1679     gLog << "Macro MagicAnalysis : JobB_SC_UP, CMatrix, RMatrix, WOptimize, RTest, WSC = "
     1757    gLog << "Macro ONOFFAnalysis : JobB_SC_UP, CMatrix, RMatrix, WOptimize, RTest, WSC = "
    16801758         << (JobB_SC_UP ? "kTRUE" : "kFALSE")  << ",  "
    16811759         << (CMatrix    ? "kTRUE" : "kFALSE")  << ",  "
    … …  
    22302308
    22312309
    2232     gLog << "Macro MagicAnalysis : End of Job B_SC_UP" << endl;
     2310    gLog << "Macro ONOFFAnalysis : End of Job B_SC_UP" << endl;
    22332311    gLog << "=======================================================" << endl;
    22342312 }
    … …  
    22492327 {
    22502328    gLog << "=====================================================" << endl;
    2251     gLog << "Macro MagicAnalysis : Start of Job C" << endl;
     2329    gLog << "Macro ONOFFAnalysis : Start of Job C" << endl;
    22522330
    22532331    gLog << "" << endl;
    2254     gLog << "Macro MagicAnalysis : JobC = "
     2332    gLog << "Macro ONOFFAnalysis : JobC = "
    22552333         << (JobC ? "kTRUE" : "kFALSE")  << endl;
    22562334
    … …  
    24582536    DeleteBinnings(&pliston);
    24592537
    2460     gLog << "Macro MagicAnalysis : End of Job C" << endl;
     2538    gLog << "Macro ONOFFAnalysis : End of Job C" << endl;
    24612539    gLog << "===================================================" << endl;
    24622540 }
    … …  
    24772555 {
    24782556    gLog << "=====================================================" << endl;
    2479     gLog << "Macro MagicAnalysis : Start of Job D" << endl;
     2557    gLog << "Macro ONOFFAnalysis : Start of Job D" << endl;
    24802558
    24812559    gLog << "" << endl;
    2482     gLog << "Macro MagicAnalysis : JobD = "
     2560    gLog << "Macro ONOFFAnalysis : JobD = "
    24832561         << (JobD        ? "kTRUE" : "kFALSE")  << endl;
    24842562
    … …  
    26982776    DeleteBinnings(&pliston);
    26992777
    2700     gLog << "Macro MagicAnalysis : End of Job D" << endl;
     2778    gLog << "Macro ONOFFAnalysis : End of Job D" << endl;
    27012779    gLog << "=======================================================" << endl;
    27022780 }
    … …  
    27232801 {
    27242802    gLog << "=====================================================" << endl;
    2725     gLog << "Macro MagicAnalysis : Start of Job E_XX" << endl;
     2803    gLog << "Macro ONOFFAnalysis : Start of Job E_XX" << endl;
    27262804
    27272805    gLog << "" << endl;
    2728     gLog << "Macro MagicAnalysis : JobE_XX, CCollArea, OEEst, WEX = "
     2806    gLog << "Macro ONOFFAnalysis : JobE_XX, CCollArea, OEEst, WEX = "
    27292807         << (JobE_XX ? "kTRUE" : "kFALSE")  << ",  "
    27302808         << (CCollArea?"kTRUE" : "kFALSE")  << ",  "
    … …  
    29513029    // Optimization of energy estimator
    29523030    //
    2953     gLog << "Macro MagicAnalysis.C : calling MagicEEst" << endl;
     3031    gLog << "Macro ONOFFAnalysis.C : calling MagicEEst" << endl;
    29543032
    29553033    TString inpath("");
    … …  
    29603038            howMany,  maxhadronness, maxalpha, maxdist,
    29613039            binsE, binsTheta);
    2962     gLog << "Macro MagicAnalysis.C : returning from MagicEEst" << endl;
     3040    gLog << "Macro ONOFFAnalysis.C : returning from MagicEEst" << endl;
    29633041 }
    29643042
    … …  
    29723050    gLog << "================================================================"
    29733051         << endl;
    2974     gLog << "Macro MagicAnalysis.C : read parameters of energy estimator and migration matrix from file '"
     3052    gLog << "Macro ONOFFAnalysis.C : read parameters of energy estimator and migration matrix from file '"
    29753053         << energyParName << "'" << endl;
    29763054    TFile enparam(energyParName);
    … …  
    33073385  }
    33083386
    3309     gLog << "Macro Analysis : End of Job E_XX" << endl;
     3387    gLog << "Macro ONOFFAnalysis : End of Job E_XX" << endl;
    33103388    gLog << "=======================================================" << endl;
    33113389 }

  • 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;

  • trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc

    r2254 r2798  
    4747#include "MGeomCam.h"
    4848
    49 #include "MPedestalCam.h"
    50 #include "MPedestalPix.h"
     49#include "MPedPhotCam.h"
     50#include "MPedPhotPix.h"
    5151
    5252#include "MCerPhotEvt.h"
    … …  
    117117        *fLog << warn << "MMcEvt not found... aborting." << endl;
    118118
    119     fPed = (MPedestalCam*)plist->FindObject("MPedestalCam");
     119    fPed = (MPedPhotCam*)plist->FindObject("MPedPhotCam");
    120120    if (!fPed)
    121121    {
    122         *fLog << err << "MPedestalCam not found... aborting." << endl;
     122        *fLog << err << "MPedPhotCam not found... aborting." << endl;
    123123        return kFALSE;
    124124    }
    … …  
    204204
    205205        const Int_t id = cerpix.GetPixId();
    206         const MPedestalPix &pix = (*fPed)[id];
     206        const MPedPhotPix &pix = (*fPed)[id];
    207207
    208208        // ratio is the area of pixel 0
    209209        //          divided by the area of the current pixel
    210210        const Double_t ratio = fCam->GetPixRatio(id);
    211         const Double_t sigma = pix.GetPedestalRms();
     211        const Double_t sigma = pix.GetRms();
    212212
    213213        fSigmaPixTheta.Fill(theta, (Double_t)id, sigma);

  • trunk/MagicSoft/Mars/mhist/MHSigmaTheta.h

    r2522 r2798  
    1616class MGeomCam;
    1717class MCerPhotEvt;
    18 class MPedestalCam;
    1918class MMcEvt;
    20 class MPedestalCam;
     19class MPedPhotCam;
    2120class MSigmabar;
    2221class MParList;
    … …  
    2726private:
    2827    const MGeomCam *fCam;        //!
    29     MPedestalCam   *fPed;        //!
     28    MPedPhotCam    *fPed;        //!
    3029    MCerPhotEvt    *fEvt;        //!
    3130    MSigmabar      *fSigmabar;   //!
Note: See TracChangeset for help on using the changeset viewer.