Changeset 18038
- Timestamp:
- 12/15/14 09:45:18 (10 years ago)
- Location:
- trunk/Mars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Mars
- Property svn:mergeinfo changed
/branches/MarsResidualTimeSpread (added) merged: 18014,18019-18022,18037
- Property svn:mergeinfo changed
-
trunk/Mars/ceres.rc
r18009 r18038 237 237 # MFixTimeOffset.FileName: resmc/fact/AllPhidoFiles_delays.csv 238 238 239 ResidualTimeSpread.Val: 0.0 240 239 241 # last line comment -
trunk/Mars/mjobs/MJSimulation.cc
r18009 r18038 650 650 write3af.AddContainer("ElectronicNoise", "RunHeaders", kTRUE, 1); 651 651 write3af.AddContainer("IntendedPulsePos", "RunHeaders", kTRUE, 1); 652 write3af.AddContainer("ResidualTimeSpread", "RunHeaders", kTRUE, 1); 652 653 write3af.AddContainer("MRawEvtData", "Events"); 653 654 write3af.AddContainer("MTruePhotonsPerPixelCont", "Events"); … … 726 727 ); 727 728 plist.AddToList(&fix_time_offsets_between_pixels_in_ns); 729 730 // ------------------------------------------------------------------- 731 732 // Jens Buss on: residual time spread 733 MParameterD resTimeSpread("ResidualTimeSpread"); 734 resTimeSpread.SetVal(0.0); 735 plist.AddToList(&resTimeSpread); 728 736 729 737 // ------------------------------------------------------------------- -
trunk/Mars/msimcamera/MSimCamera.cc
r18009 r18038 180 180 } 181 181 */ 182 fResidualTimeSpread = (MParameterD*)pList->FindObject("ResidualTimeSpread"); 183 if (!fResidualTimeSpread) 184 { 185 *fLog << err << "ResidualTimeSpread [MParameterD] not found... aborting." << endl; 186 return kFALSE; 187 } 182 188 183 189 // Create it here to make sure that MGeomApply will set the correct size … … 305 311 fCamera->SetValidRange(TMath::FloorNint(pr), TMath::CeilNint(nlen+pl)); 306 312 313 Double_t timeoffset[npix]; 314 315 307 316 // Add electronic noise to empty channels 308 317 for (UInt_t i=0; i<npix; i++) 309 318 { 319 320 // Get the ResidualTimeSpread Parameter 321 const Double_t residualTimeSpread = fResidualTimeSpread->GetVal(); 322 323 // Jens Buss on residual time spread: 324 // randomly draw an additional time offset to be added to the arrivaltime 325 // from a gaussian normal distribution with a given standard deviation 326 timeoffset[i] = gRandom->Gaus(0.0, residualTimeSpread); 310 327 const MPedestalPix &pix = (*fElectronicNoise)[i]; 311 328 … … 405 422 //-------------------------------------------------------------------------- 406 423 424 407 425 // Simulate pulses 408 426 for (Int_t i=0; i<num; i++) … … 419 437 // column to hold the offsets in ns. 420 438 t = t + freq*fFixTimeOffsetsBetweenPixelsInNs->fM[idx][0]; 439 440 // Jens Buss on residual time spread: 441 // add random time offset to the arrivaltimes 442 t = t + timeoffset[idx]; 421 443 422 444 // FIXME: Time jitter? -
trunk/Mars/msimcamera/MSimCamera.h
r18009 r18038 36 36 37 37 MParameterD *fCrosstalkCoeffParam; 38 MParameterD *fResidualTimeSpread; //! Container to store a standard deviation for a residual time spread 38 39 39 40 MMatrix *fFixTimeOffsetsBetweenPixelsInNs; //! Container to store the fix temporal offsets for each pixel in ns
Note:
See TracChangeset
for help on using the changeset viewer.