Changeset 18333 for trunk/Mars

Timestamp:

09/02/15 11:13:15 (9 years ago)

Author:

Jens Buss

Message:

Reintegrated private branch for the simulation of a gapd time jitter to the trunk

Location:

trunk/Mars

Files:

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

trunk/Mars/ceres.rc

@@ -245 +245 @@
 
 ResidualTimeSpread.Val: 0.0
+GapdTimeJitter.Val: 0.0
 
 # last line comment

trunk/Mars/mjobs/MJSimulation.cc

@@ -657 +657 @@
     write3af.AddContainer("IntendedPulsePos", "RunHeaders", kTRUE, 1);
     write3af.AddContainer("ResidualTimeSpread", "RunHeaders", kTRUE, 1);
+    write3af.AddContainer("GapdTimeJitter", "RunHeaders", kTRUE, 1);
     write3af.AddContainer("MRawEvtData",      "Events");
     write3af.AddContainer("MTruePhotonsPerPixelCont", "Events");
@@ -739 +740 @@
     resTimeSpread.SetVal(0.0);
     plist.AddToList(&resTimeSpread);
+
+    // -------------------------------------------------------------------
+
+    // Jens Buss on: residual time spread
+    MParameterD gapdTimeJitter("GapdTimeJitter");
+    gapdTimeJitter.SetVal(0.0);
+    plist.AddToList(&gapdTimeJitter);
 
     // -------------------------------------------------------------------

trunk/Mars/msimcamera/MSimCamera.cc

@@ -188 +188 @@
     }
 
+    // Get GapdTimeJitter from parameter list
+    fGapdTimeJitter = (MParameterD*)pList->FindObject("GapdTimeJitter");
+    if (!fGapdTimeJitter)
+    {
+        *fLog << err << "GapdTimeJitter [MParameterD] not found... aborting." << endl;
+        return kFALSE;
+    }
+
     // Create it here to make sure that MGeomApply will set the correct size
     fElectronicNoise = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", "ElectronicNoise");
@@ -423 +431 @@
     //--------------------------------------------------------------------------
 
+    // Get the ResidualTimeSpread Parameter
+    const Double_t gapdTimeJitter = fGapdTimeJitter->GetVal();
     
     // Simulate pulses
@@ -444 +454 @@
 
         // FIXME: Time jitter?
+        // Jens Buss on GapdTimeJitter
+        // add also a time offset to arrival times of single photons
+        // TODO: change to ns, use: fRunHeader->GetFreqSampling()
+        Double_t timeJitter = gRandom->Gaus(0.0, gapdTimeJitter);
+        t = t + timeJitter;
+
         // FIXME: Add additional routing here?
         // FIMXE: How stable is the gain?

trunk/Mars/msimcamera/MSimCamera.h

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