Changeset 18038 for trunk

Timestamp:

12/15/14 09:45:18 (10 years ago)

Author:

Jens Buss

Message:

Reintegrating branch for feature ResidualTimeSpread into Branch

Location:

trunk/Mars

Files:

• . (modified) (1 prop)
• ceres.rc (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (2 diffs)
• msimcamera/MSimCamera.cc (modified) (4 diffs)
• msimcamera/MSimCamera.h (modified) (1 diff)

trunk/Mars/ceres.rc

@@ -237 +237 @@
 # MFixTimeOffset.FileName: resmc/fact/AllPhidoFiles_delays.csv
 
+ResidualTimeSpread.Val: 0.0
+
 # last line comment

trunk/Mars/mjobs/MJSimulation.cc

@@ -650 +650 @@
     write3af.AddContainer("ElectronicNoise",  "RunHeaders", kTRUE, 1);
     write3af.AddContainer("IntendedPulsePos", "RunHeaders", kTRUE, 1);
+    write3af.AddContainer("ResidualTimeSpread", "RunHeaders", kTRUE, 1);
     write3af.AddContainer("MRawEvtData",      "Events");
     write3af.AddContainer("MTruePhotonsPerPixelCont", "Events");
@@ -726 +727 @@
     );
     plist.AddToList(&fix_time_offsets_between_pixels_in_ns);
+
+    // -------------------------------------------------------------------
+
+    // Jens Buss on: residual time spread
+    MParameterD resTimeSpread("ResidualTimeSpread");
+    resTimeSpread.SetVal(0.0);
+    plist.AddToList(&resTimeSpread);
 
     // -------------------------------------------------------------------

trunk/Mars/msimcamera/MSimCamera.cc

@@ -180 +180 @@
     }
  */
+    fResidualTimeSpread = (MParameterD*)pList->FindObject("ResidualTimeSpread");
+    if (!fResidualTimeSpread)
+    {
+        *fLog << err << "ResidualTimeSpread [MParameterD] not found... aborting." << endl;
+        return kFALSE;
+    }
 
     // Create it here to make sure that MGeomApply will set the correct size
@@ -305 +311 @@
     fCamera->SetValidRange(TMath::FloorNint(pr), TMath::CeilNint(nlen+pl));
 
+    Double_t timeoffset[npix];
+
+
     // Add electronic noise to empty channels
     for (UInt_t i=0; i<npix; i++)
     {
+
+        // Get the ResidualTimeSpread Parameter
+        const Double_t residualTimeSpread = fResidualTimeSpread->GetVal();
+
+        // Jens Buss on residual time spread:
+        // randomly draw an additional time offset to be added to the arrivaltime 
+        // from a gaussian normal distribution with a given standard deviation 
+        timeoffset[i] = gRandom->Gaus(0.0, residualTimeSpread);
         const MPedestalPix &pix = (*fElectronicNoise)[i];
 
@@ -405 +422 @@
     //--------------------------------------------------------------------------
 
+    
     // Simulate pulses
     for (Int_t i=0; i<num; i++)
@@ -419 +437 @@
         // column to hold the offsets in ns.
         t = t + freq*fFixTimeOffsetsBetweenPixelsInNs->fM[idx][0];
+
+        // Jens Buss on residual time spread:
+        // add random time offset to the arrivaltimes
+        t = t + timeoffset[idx];
 
         // FIXME: Time jitter?

trunk/Mars/msimcamera/MSimCamera.h

@@ -36 +36 @@
 
     MParameterD       *fCrosstalkCoeffParam;
+    MParameterD       *fResidualTimeSpread;    //! Container to store a standard deviation for a residual time spread
 
     MMatrix *fFixTimeOffsetsBetweenPixelsInNs; //! Container to store the fix temporal offsets for each pixel in ns