Changeset 19667 for trunk

Timestamp:

09/23/19 18:22:46 (5 years ago)

Author:

tbretz

Message:

Added Width and Length to adjustable binnings, return an error in case no file was given, fixed the display of the delay between the first photon and the trigger, fixed th e binning of the corresponding histogram (adjusted to nanoseconds)

File:

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

trunk/Mars/mjobs/MJSimulation.cc

@@ -385 +385 @@
     MBinning *binsew = (MBinning*) plist.FindCreateObj("MBinning","BinningMedLength");
     binsew->SetEdges(150,     0,       15);
+    plist.FindCreateObj("MBinning","BinningWidth");
+    plist.FindCreateObj("MBinning","BinningLength");
     plist.FindCreateObj("MBinning","BinningDistC");
     plist.FindCreateObj("MBinning","BinningDist");
@@ -502 +504 @@
     // --------------------------------------------------------------------------------
     // Dominik and Sebastian on: fix time offsets
-    MMatrix fix_time_offsets_between_pixels_in_ns(
-        "MFixTimeOffset","titel"
-    );
+    MMatrix fix_time_offsets_between_pixels_in_ns("MFixTimeOffset", 0);
     plist.AddToList(&fix_time_offsets_between_pixels_in_ns);
 
@@ -540 +540 @@
     else
         read.AddFiles(iter);
+
+    if (read.GetNumFiles()==0)
+    {
+        *fLog << err << "No files to read." << endl;
+        return kFALSE;
+    }
 
     // --------------------------------------------------------------------------------
@@ -714 +720 @@
     SetupHist(mhn4);
 
-    MH3 mhtp("TriggerPos.fVal-IntendedPulsePos.fVal-PulseShape.GetWidth");
+    MH3 mhtp("TriggerPos.fVal-IntendedPulsePos.fVal-PulseShape.GetWidth*1000/MRawRunHeader.GetFreqSampling");
     mhtp.SetName("TrigPos");
-    mhtp.SetTitle("Trigger position w.r.t. the first photon hitting a detector");
+    mhtp.SetTitle("Trigger position w.r.t. the first photon hitting a detector [ns]");
 
     MH3 mhew("MPhotonStatistics.fLength");
@@ -1064 +1070 @@
     MBinning *binstr = (MBinning*) plist.FindObject("BinningTrigPos");
     if (binstr->IsDefault())
-        binstr->SetEdgesLin(150, -shape.GetWidth(),
-                           header.GetFreqSampling()/1000.*header.GetNumSamples()+shape.GetWidth());
+        binstr->SetEdgesLin(150, -header.GetFreqSampling()/1000.*shape.GetWidth(),
+                            header.GetFreqSampling()/1000.*(header.GetNumSamples()+shape.GetWidth()));
 
     if (binsd->IsDefault() && cam)