Changeset 3339


Ignore:
Timestamp:
02/27/04 06:52:39 (21 years ago)
Author:
wittek
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C

    r3305 r3339  
    5353        //.....
    5454        MBinning *binsb = new MBinning("BinningSigmabar");
    55         binsb->SetEdges( 100,  0.0,  5.0);
     55        binsb->SetEdges( 100,  0.0,  50.0);
    5656        plist->AddToList(binsb);
    5757
     
    8080
    8181        MBinning *binsdiff = new MBinning("BinningDiffsigma2");
    82         binsdiff->SetEdges(100, -10.0, 15.0);
     82        binsdiff->SetEdges(100, -300.0, 500.0);
    8383        plist->AddToList(binsdiff);
    8484
     
    181181      //const char *onfile  = "MCerPhot_output";
    182182      //const char *onfile  = "*.ON";
    183       //const char *onfile  = "12*.ON";
    184       const char *onfile  = "12410.ON";
     183      const char *onfile  = "12*.ON";
     184      //const char *onfile  = "1238*.ON";
    185185
    186186     const char *mcfile  = "/data/MAGIC/mc_eth/magLQE_3/gh/0/0/G_M0_00_0_550*.root";
     
    191191      // path for input for Mars
    192192      //TString inPath = "/.magic/magicserv01/scratch/";
    193      TString inPath = "/mnt/data17a/hbartko/";
    194      //TString inPath = "~wittek/datacrab_feb04/";
     193      //TString inPath = "/mnt/data17a/hbartko/";
     194      //TString inPath = "~wittek/datacrab_feb04/";
     195      //TString inPath = "~wittek/datacrab_26feb04/";
     196     TString inPath = "/.magic/magicserv01/scratch/calibrated/";
     197     //TString inPath = "/.magic/magicserv01/scratch/David/CalibratedRuns/";
    195198
    196199      // path for output from Mars
    197       TString outPath = "~wittek/datacrab_feb04/";
     200      //TString outPath = "~wittek/datacrab_feb04/";
     201      TString outPath = "~wittek/datacrab_26feb04/";
    198202
    199203      //-----------------------------------------------
     
    371375    outNameImage += "Hillas";
    372376    outNameImage += typeInput;
    373     outNameImage += "1e.root";
     377    outNameImage += "1.root";
    374378    gLog << "padded data to be written onto : " << outNameImage << endl;
    375379
     
    701705    sourcefromstar.SetSourceAndStarPosition("Crab", 22, 0, 52, 5, 34, 32,
    702706                                        "Zeta-Tau", 21, 8, 33, 5, 37, 38.7);
    703     sourcefromstar.AddFile("~wittek/datacrab_feb04/positions.4.txt", 0);
    704 
    705     MBlindPixelCalc blindbeforepad;
     707    if (typeInput == "ON")
     708      sourcefromstar.AddFile("~wittek/datacrab_26feb04/positionsOn.4.txt", 0);
     709    else if (typeInput == "OFF")
     710      sourcefromstar.AddFile("~wittek/datacrab_26feb04/positionsOff.txt", 0);
     711
     712    //MBlindPixelCalc blindbeforepad;
    706713    //blindbeforepad.SetUseBlindPixels();
    707     blindbeforepad.SetName("BlindBeforePadding");
    708 
    709     MBlindPixelCalc blind;
     714    //blindbeforepad.SetName("BlindBeforePadding");
     715
     716    //MBlindPixelCalc blind;
    710717    //blind.SetUseBlindPixels();
     718    //blind.SetUseInterpolation();
     719    //blind.SetName("BlindAfterPadding");
     720
     721    MSigmabarCalc sigbar;
     722
     723    MBadPixelCalcRms blind;
     724    //blind.SetUseBlindPixels();
     725    blind.SetUseInterpolation();
     726    //blind.SetCheckPedestalRMS();
    711727    blind.SetName("BlindAfterPadding");
    712728
     
    715731    contbasic.SetName("SelBasic");
    716732
    717     //MFillH fillblind("BlindPixels[MHBlindPixels]", "MBlindPixels");
    718     //fillblind.SetName("HBlind");
     733    MFillH fillblind("BlindPixels[MHBlindPixels]", "MBlindPixels");
     734    fillblind.SetName("HBlind");
    719735
    720736    MSigmabarCalc sigbarcalc;
     
    759775    selstandard.SetHillasName(fHilName);
    760776    selstandard.SetImgParName(fImgParName);
    761     selstandard.SetCuts(200, 6, 600, 0.4, 1.1, 0.0, 0.0);
     777    selstandard.SetCuts(200, 4, 600, 0.2, 1.3, 0.0, 0.0);
    762778    MContinue contstandard(&selstandard);
    763779    contstandard.SetName("SelStandard");
     
    766782      MWriteRootFile write(outNameImage);
    767783
    768       //write.AddContainer("MRawRunHeader", "RunHeaders");
     784      write.AddContainer("MRawRunHeader", "RunHeaders");
    769785      //write.AddContainer("MMcRunHeader",  "RunHeaders", kFALSE);
    770786      //write.AddContainer("MTime",         "Events");
     
    803819    //  tliston.AddToList(&pointcorr);
    804820
     821    tliston.AddToList(&sigbar);
    805822    tliston.AddToList(&blind);
    806823    tliston.AddToList(&contbasic);
    807824
    808     //tliston.AddToList(&fillblind);
    809     tliston.AddToList(&sigbarcalc);
     825    tliston.AddToList(&fillblind);
     826    //tliston.AddToList(&sigbarcalc);
    810827    tliston.AddToList(&fillsigtheta);
    811828    tliston.AddToList(&clean);
     
    847864
    848865    pliston.FindObject("SigmaTheta", "MHSigmaTheta")->DrawClone();
    849     //pliston.FindObject("BlindPixels", "MHBlindPixels")->DrawClone();
     866    pliston.FindObject("BlindPixels", "MHBlindPixels")->DrawClone();
    850867
    851868    pliston.FindObject("MHHillas")->DrawClone();
     
    855872    pliston.FindObject("MHStarMap")->DrawClone();
    856873
    857     DeleteBinnings(&pliston);
     874    //DeleteBinnings(&pliston);
    858875
    859876      gLog << "End of padding" << endl;
  • trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc

    r3300 r3339  
    433433  *fLog << all << "MSourcePosfromStarPos::ReInit; run = " << run << endl;
    434434
    435   // define default values
     435  // define default values for source position and (theta, phi)
    436436  Double_t xSource_def =  51.0;
    437437  Double_t ySource_def = -59.0;
    438438  Double_t theta_def = 25.0;
    439   Double_t phi_def   =  0.0;
     439  Double_t phi_def   = 90.0;
    440440
    441441  //-------------------------------------------------------------------
  • trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc

    r3140 r3339  
    3535#include "MMcEvt.hxx"
    3636#include "MBlindPixels.h"
     37#include "MGeomCam.h"
    3738#include "MPedPhotCam.h"
    3839#include "MParList.h"
     
    7879Bool_t MHBlindPixels::SetupFill(const MParList *plist)
    7980{
     81    MGeomCam *fCam = (MGeomCam*)plist->FindObject(AddSerialNumber("MGeomCam"));
     82    if (!fCam)   
     83    {
     84        *fLog << err << "MHBlindPixels::SetupFill; MGeomCam not found... aborting." << endl;
     85        return kFALSE;
     86    }
     87
    8088    fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
    8189    if (!fMcEvt)
     
    92100        return kFALSE;
    93101    }
     102    fPedPhot->InitSize(fCam->GetNumPixels());
    94103   
    95104
  • trunk/MagicSoft/Mars/mhist/MHBlindPixels.h

    r3140 r3339  
    1212class MMcEvt;
    1313class MParList;
    14 
     14class MGeomCam;
    1515
    1616class MHBlindPixels : public MH
    1717{
    1818private:
    19     MPedPhotCam   *fPedPhot;      //!
     19    MGeomCam      *fCam;      //!
     20    MPedPhotCam   *fPedPhot;  //!
    2021    MMcEvt        *fMcEvt;    //!
    2122
  • trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc

    r3140 r3339  
    113113Bool_t MHSigmaTheta::SetupFill(const MParList *plist)
    114114{
     115    fCam = (MGeomCam*)plist->FindObject("MGeomCam");
     116    if (!fCam)
     117    {
     118        *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl;
     119        return kFALSE;
     120    }
     121
    115122    fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
    116123    if (!fMcEvt)
    117124        *fLog << warn << "MMcEvt not found... aborting." << endl;
    118125
     126
    119127    fPed = (MPedPhotCam*)plist->FindObject("MPedPhotCam");
    120128    if (!fPed)
     
    123131        return kFALSE;
    124132    }
    125 
    126     fCam = (MGeomCam*)plist->FindObject("MGeomCam");
    127     if (!fCam)
    128     {
    129         *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl;
    130         return kFALSE;
    131     }
     133    fPed->InitSize(fCam->GetNumPixels());
     134
    132135
    133136    fEvt = (MCerPhotEvt*)plist->FindObject("MCerPhotEvt");
     
    166169
    167170    // Get binning for pixel number
    168     //const UInt_t npix1 = fPed->GetSize()+1;
    169     //*fLog << "npix1 = " << npix1 << endl;
    170     //MBinning binspix("BinningPixel");
    171     //binspix.SetEdges(npix1, -0.5, npix1-0.5);
    172     // the above gives npix1 = 1; therefore :
     171    const UInt_t npix1 = fPed->GetSize()+1;
     172    *fLog << "npix1 = " << npix1 << endl;
    173173    MBinning binspix("BinningPixel");
    174     binspix.SetEdges(578, -0.5, 577.5);
     174    binspix.SetEdges(npix1, -0.5, npix1-0.5);
    175175
    176176    // Set binnings in histograms
Note: See TracChangeset for help on using the changeset viewer.