Ignore:
Timestamp:
02/22/09 23:36:01 (15 years ago)
Author:
tbretz
Message:
*** empty log message ***
File:
1 edited

Legend:

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

    r9359 r9362  
    215215{
    216216    // Common run headers
     217    write.AddContainer("MMcCorsikaRunHeader", "RunHeaders", kFALSE);
    217218    write.AddContainer("MCorsikaRunHeader",   "RunHeaders", kFALSE);
    218219    write.AddContainer("MRawRunHeader",       "RunHeaders");
     
    346347    // -------------------------------------------------------------------
    347348
    348     MBinning binse( 100,     1,   100000, "BinningEnergy", "log");
    349     MBinning binss( 100,     1, 10000000, "BinningSize",   "log");
     349    MBinning binse( 100,     1,   100000, "BinningEnergy",    "log");
     350    MBinning binsth( 35,   0.9,   900000, "BinningThreshold", "log");
     351    MBinning binsee( 35,   0.9,   900000, "BinningEnergyEst", "log");
     352    MBinning binss( 100,     1, 10000000, "BinningSize",      "log");
    350353    MBinning binsi( 100,  -500,      500, "BinningImpact");
    351354    MBinning binsh( 150,     0,       50, "BinningHeight");
     
    353356    MBinning binszd( 70,     0,       70, "BinningZd");
    354357    MBinning binsvc( 45,     0,        9, "BinningViewCone");
    355     MBinning binsew(150,     0,       50, "BinningEvtWidth");
     358    MBinning binsel(150,     0,       50, "BinningTotLength");
     359    MBinning binsew(150,     0,       15, "BinningMedLength");
    356360    MBinning binsd("BinningDistC");
    357361    MBinning binsd0("BinningDist");
    358362    MBinning binstr("BinningTrigPos");
    359363
     364    plist.AddToList(&binsee);
    360365    plist.AddToList(&binse);
     366    plist.AddToList(&binsth);
    361367    plist.AddToList(&binss);
    362368    plist.AddToList(&binsi);
     
    365371    plist.AddToList(&binsaz);
    366372    plist.AddToList(&binsvc);
     373    plist.AddToList(&binsel);
    367374    plist.AddToList(&binsew);
    368375    plist.AddToList(&binstr);
     
    380387
    381388    MH3 mhew("MPhotonStatistics.fLength");
    382     mhew.SetName("EvtWidth");
    383     mhew.SetTitle("Time between first and last photon hitting a detector");
     389    mhew.SetName("TotLength");
     390    mhew.SetTitle("Time between first and last photon hitting a detector;L [ns]");
    384391
    385392    MH3 mhed("MPhotonStatistics.fTimeMedDev");
    386     mhed.SetName("EvtMedDev;EvtWidth");
     393    mhed.SetName("MedLength");
     394    mhed.SetTitle("Median deviation (1\\sigma);L [ns]");
    387395
    388396    MFillH fillh1(&mhn1, "", "FillCorsika");
     
    488496    //  NSB = 0.2*6e-3
    489497
     498    // FIXME: Simulate photons before QE!
     499
    490500    MSimRandomPhotons  simnsb;
    491501//    simnsb.SetFreq(0.005, 0.004);    // 5MHz/cm^2, 4MHz
     
    530540    hcalc.Disable(MHillasCalc::kCalcConc);
    531541
    532     MHCamEvent evt0a(/*10*/0, "Signal",    "Average signal;;S [ph]");
    533     MHCamEvent evt0c(/*10*/0, "MaxSignal", "Maximum signal;;S [ph]");
     542    MHCamEvent evt0a(/*10*/3, "Signal",    "Average signal (absolute);;S [ph]");
     543    MHCamEvent evt0c(/*10*/3, "MaxSignal", "Maximum signal (absolute);;S [ph]");
    534544    MHCamEvent evt0d(/*11*/8, "ArrTm",     "Time after first photon;;T [ns]");
    535545    evt0a.SetErrorSpread(kFALSE);
     
    653663        //tasks.AddToList(&fillx2);
    654664        tasks.AddToList(&fillx3);
     665        //tasks.AddToList(&fillx4);
     666        //tasks.AddToList(&fillx5);
     667    }
     668    if (header.IsDataRun())
     669    {
    655670        tasks.AddToList(&fillth);
    656671        tasks.AddToList(&fillca);
    657         //tasks.AddToList(&fillx4);
    658         //tasks.AddToList(&fillx5);
    659672    }
    660673    //-------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.