Changeset 9362 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/22/09 23:36:01 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJSimulation.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -215 +215 @@
 {
     // Common run headers
+    write.AddContainer("MMcCorsikaRunHeader", "RunHeaders", kFALSE);
     write.AddContainer("MCorsikaRunHeader",   "RunHeaders", kFALSE);
     write.AddContainer("MRawRunHeader",       "RunHeaders");
@@ -346 +347 @@
     // -------------------------------------------------------------------
 
-    MBinning binse( 100,     1,   100000, "BinningEnergy", "log");
-    MBinning binss( 100,     1, 10000000, "BinningSize",   "log");
+    MBinning binse( 100,     1,   100000, "BinningEnergy",    "log");
+    MBinning binsth( 35,   0.9,   900000, "BinningThreshold", "log");
+    MBinning binsee( 35,   0.9,   900000, "BinningEnergyEst", "log");
+    MBinning binss( 100,     1, 10000000, "BinningSize",      "log");
     MBinning binsi( 100,  -500,      500, "BinningImpact");
     MBinning binsh( 150,     0,       50, "BinningHeight");
@@ -353 +356 @@
     MBinning binszd( 70,     0,       70, "BinningZd");
     MBinning binsvc( 45,     0,        9, "BinningViewCone");
-    MBinning binsew(150,     0,       50, "BinningEvtWidth");
+    MBinning binsel(150,     0,       50, "BinningTotLength");
+    MBinning binsew(150,     0,       15, "BinningMedLength");
     MBinning binsd("BinningDistC");
     MBinning binsd0("BinningDist");
     MBinning binstr("BinningTrigPos");
 
+    plist.AddToList(&binsee);
     plist.AddToList(&binse);
+    plist.AddToList(&binsth);
     plist.AddToList(&binss);
     plist.AddToList(&binsi);
@@ -365 +371 @@
     plist.AddToList(&binsaz);
     plist.AddToList(&binsvc);
+    plist.AddToList(&binsel);
     plist.AddToList(&binsew);
     plist.AddToList(&binstr);
@@ -380 +387 @@
 
     MH3 mhew("MPhotonStatistics.fLength");
-    mhew.SetName("EvtWidth");
-    mhew.SetTitle("Time between first and last photon hitting a detector");
+    mhew.SetName("TotLength");
+    mhew.SetTitle("Time between first and last photon hitting a detector;L [ns]");
 
     MH3 mhed("MPhotonStatistics.fTimeMedDev");
-    mhed.SetName("EvtMedDev;EvtWidth");
+    mhed.SetName("MedLength");
+    mhed.SetTitle("Median deviation (1\\sigma);L [ns]");
 
     MFillH fillh1(&mhn1, "", "FillCorsika");
@@ -488 +496 @@
     //  NSB = 0.2*6e-3
 
+    // FIXME: Simulate photons before QE!
+
     MSimRandomPhotons  simnsb;
 //    simnsb.SetFreq(0.005, 0.004);    // 5MHz/cm^2, 4MHz
@@ -530 +540 @@
     hcalc.Disable(MHillasCalc::kCalcConc);
 
-    MHCamEvent evt0a(/*10*/0, "Signal",    "Average signal;;S [ph]");
-    MHCamEvent evt0c(/*10*/0, "MaxSignal", "Maximum signal;;S [ph]");
+    MHCamEvent evt0a(/*10*/3, "Signal",    "Average signal (absolute);;S [ph]");
+    MHCamEvent evt0c(/*10*/3, "MaxSignal", "Maximum signal (absolute);;S [ph]");
     MHCamEvent evt0d(/*11*/8, "ArrTm",     "Time after first photon;;T [ns]");
     evt0a.SetErrorSpread(kFALSE);
@@ -653 +663 @@
         //tasks.AddToList(&fillx2);
         tasks.AddToList(&fillx3);
+        //tasks.AddToList(&fillx4);
+        //tasks.AddToList(&fillx5);
+    }
+    if (header.IsDataRun())
+    {
         tasks.AddToList(&fillth);
         tasks.AddToList(&fillca);
-        //tasks.AddToList(&fillx4);
-        //tasks.AddToList(&fillx5);
     }
     //-------------------------------------------