Changeset 9572 for trunk


Ignore:
Timestamp:
04/19/10 13:20:08 (15 years ago)
Author:
tbretz
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

    r9564 r9572  
    219219    hist.AddHist("(MCorsikaEvtHeader.fAz+MCorsikaRunHeader.fMagneticFieldAz)*TMath::RadToDeg()", "MCorsikaEvtHeader.fZd*TMath::RadToDeg()");
    220220    hist.InitName("SkyOrigin;Az;Zd");
    221     hist.InitTitle("Sky Origin;Az [\\deg];Zd [\\deg]");
     221    hist.InitTitle("Sky Origin;Az [\\circ];Zd [\\circ]");
    222222    hist.SetDrawOption("colz");
    223223    hist.SetAutoRange();
     
    225225    hist.AddHist("IncidentAngle.fVal");
    226226    hist.InitName("ViewCone");
    227     hist.InitTitle("Incident Angle;\\alpha [\\deg]");
     227    hist.InitTitle("Incident Angle;\\alpha [\\circ]");
    228228}
    229229
     
    517517    const TString rule1(Form("s/cer([0-9]+)/%s\\/00$1_R_MonteCarlo.root/", Esc(fPathOut).Data()));
    518518    const TString rule2(Form("s/cer([0-9]+)/%s\\/00$1_Y_MonteCarlo.root/", Esc(fPathOut).Data()));
     519    const TString rule4(Form("s/cer([0-9]+)/%s\\/00$1_I_MonteCarlo.root/", Esc(fPathOut).Data()));
    519520    const TString rule3(Form(fmt, Esc(fPathOut).Data()));
    520521
     522    MWriteRootFile write4a( 2, rule4, fOverwrite?"RECREATE":"NEW", "Star file");
     523    MWriteRootFile write4b( 2, rule4, fOverwrite?"RECREATE":"NEW", "Star file");
    521524    MWriteRootFile write3a( 2, rule3, fOverwrite?"RECREATE":"NEW", "Camera file");
    522525    MWriteRootFile write3b( 2, rule3, fOverwrite?"RECREATE":"NEW", "Camera file");
     
    532535    write3a.SetName("WriteCamData");
    533536    write3b.SetName("WriteCamMC");
     537    write4a.SetName("WriteImgData");
     538    write4b.SetName("WriteImgMC");
    534539
    535540    SetupCommonFileStructure(write1a);
    536541    SetupCommonFileStructure(write2a);
    537542    SetupCommonFileStructure(write3a);
    538 
    539     // R: Dedicated file structureedicated events
     543    SetupCommonFileStructure(write4a);
     544
     545    // R: Dedicated file structure
    540546    write1a.AddContainer("MPhotonEvent", "Events");
    541547
    542     // I: Dedicated file structureedicated events
     548    // Y: Dedicated file structure
    543549    write2a.AddContainer("MPedPhotFromExtractorRndm", "RunHeaders"); // FIXME: Needed for the signal files to be display in MARS
    544550    write2a.AddContainer("MSignalCam", "Events");
    545551
    546     // D: Dedicated file structureedicated events
     552    // D: Dedicated file structure
    547553    write3a.AddContainer("ElectronicNoise", "RunHeaders");
    548554    write3a.AddContainer("MRawEvtData", "Events");
     555
     556    // I: Dedicated file structure
     557    write4a.AddContainer("MHillas",       "Events");
     558    write4a.AddContainer("MHillasSrc",    "Events");
     559    write4a.AddContainer("MImagePar",     "Events");
     560    write4a.AddContainer("MNewImagePar",  "Events");
    549561
    550562    // Basic MC data
     
    552564    write2b.AddContainer("MMcEvtBasic", "OriginalMC");
    553565    write3b.AddContainer("MMcEvtBasic", "OriginalMC");
     566    write4b.AddContainer("MMcEvtBasic", "OriginalMC");
    554567
    555568    // -------------------------------------------------------------------
     
    602615    // Remove isolated pixels
    603616    MImgCleanStd clean(0, 0);
    604     clean.SetCleanLvl0(0); // The level above which isolated pixels are kept
     617    //clean.SetCleanLvl0(0); // The level above which isolated pixels are kept
    605618    clean.SetCleanRings(0);
    606619    clean.SetMethod(MImgCleanStd::kAbsolute);
     
    641654        if (!fPathOut.IsNull() && !HasNullOut())
    642655        {
    643             tasks.AddToList(&write1b);
     656            //tasks.AddToList(&write1b);
    644657            tasks.AddToList(&write2b);
    645658            if (fCamera)
    646659                tasks.AddToList(&write3b);
     660            if (header.IsDataRun())
     661                tasks.AddToList(&write4b);
    647662        }
    648663        //    if (header.IsPointRun())
     
    710725    if (!fPathOut.IsNull() && !HasNullOut())
    711726    {
    712         tasks.AddToList(&write1a);
     727        //tasks.AddToList(&write1a);
    713728        if (!header.IsPedestalRun())
    714729            tasks.AddToList(&write2a);
     
    733748        tasks.AddToList(&fillx0a);
    734749        tasks.AddToList(&fillx0c);
    735         if (!header.IsCalibrationRun())
    736             tasks.AddToList(&clean);
     750    }
     751    if (header.IsDataRun())
     752    {
     753        tasks.AddToList(&clean);
    737754        tasks.AddToList(&hcalc);
    738755        tasks.AddToList(&cut);
     
    742759        tasks.AddToList(&fillx3);
    743760        tasks.AddToList(&fillx4);
     761        tasks.AddToList(&write4a);
    744762        //tasks.AddToList(&fillx5);
    745     }
    746     if (header.IsDataRun())
    747     {
     763
    748764        tasks.AddToList(&fillh4);
    749765        tasks.AddToList(&fillth);
Note: See TracChangeset for help on using the changeset viewer.