Changeset 18006 for branches

Timestamp:

11/07/14 13:23:50 (10 years ago)

Author:

smueller

Message:

Fix tempral offsets are added to the relative arrival time in the camera simulation. The offsets are taken from the new generic MMatrix container. In the ceres.rc file is a new key value pair specifieing the path to a text file holding the delay data.

Location:

branches/MarsFixTimeOffsetBranch

Files:

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

branches/MarsFixTimeOffsetBranch/ceres.rc

@@ -233 +233 @@
 # Does not trigger anyway
 ContEmpty3.Condition: MPhotonEvent.GetNumPhotons<10
+
+MFixTimeOffset.FileName: resmc/fact/pixel_delays_ALL_ZERO.csv
+# MFixTimeOffset.FileName: resmc/fact/AllPhidoFiles_delays.csv
+
+# last line comment

branches/MarsFixTimeOffsetBranch/msimcamera/MSimCamera.cc

@@ -122 +122 @@
         return kFALSE;
     }
+    // -------------------------------------------------------------------
+    // Dominik Neise and Sebastian Mueller on fix time offsets:
+    // We obtain the fix temporal offsets for the FACT camera pixels out of 
+    // a text file. The textfile must be mentioned in the ceres.rc file.
+    // There are no default offsets on purporse. The filename must be specified
+    // in ceres.rc and the file must be parsed without errors and it must 
+    // provide exactly 1440 floating point numbers.   
+    fFixTimeOffsetsBetweenPixelsInNs = 
+    (MMatrix*)pList->FindObject("MFixTimeOffset");
+    if (!fFixTimeOffsetsBetweenPixelsInNs)
+    {
+        // the key value pair providing the text file is not present in the
+        // environment env.
+        *fLog << err << "In Source: "<< __FILE__ <<" in line: "<< __LINE__;
+        *fLog << " in function: "<< __func__ <<"\n";
+        *fLog << "MFixTimeOffset not found... aborting." << endl;
+        return kFALSE;
+
+    }
+    else if ( fFixTimeOffsetsBetweenPixelsInNs->fM.size() != 1440 )
+    {
+        // The number of time offsets must match the number of pixels in the
+        // FACT camera.
+        *fLog << err << "In Source: "<< __FILE__ <<" in line: "<< __LINE__;
+        *fLog << " in function: "<< __func__ <<"\n";
+        *fLog << "MFixTimeOffset has the wrong dimension! ";
+        *fLog << "There should be "<< 1440 <<" time offsets ";
+        *fLog << "(one for each pixel in FACT) but there are: ";
+        *fLog << fFixTimeOffsetsBetweenPixelsInNs->fM.size() << "! ";
+        *fLog << "... aborting." << endl;
+        return kFALSE;
+    }
+    // Check all entries for inf and nan. Those are not accepted here.
+    for( std::vector< double > row : fFixTimeOffsetsBetweenPixelsInNs->fM ){
+        for( double number : row){
+
+            if( std::isnan(number) || std::isinf(number) ){
+
+                *fLog << err << "In Source: "<< __FILE__ <<" in line: ";
+                *fLog << __LINE__;
+                *fLog << " in function: "<< __func__ <<"\n";
+                *fLog << "There is a non normal number in the fix temporal ";
+                *fLog << "pixel offsets. This is at least one number is ";
+                *fLog << "NaN or Inf. This here is >"<< number;
+                *fLog << "<... aborting." << endl;               
+                return kFALSE;
+            }
+        }
+    }
+    // -------------------------------------------------------------------
 /*
     fPulsePos = (MParameterD*)pList->FindObject("IntendedPulsePos", "MParameterD");
@@ -353 +403 @@
     }
 
+    //--------------------------------------------------------------------------
+
     // Simulate pulses
     for (Int_t i=0; i<num; i++)
@@ -359 +411 @@
 
         const UInt_t   idx = ph.GetTag();
-        const Double_t t   = (ph.GetTime()-fStat->GetTimeFirst())*freq+rndm;// - fSpline->GetXmin();
+        Double_t t   = (ph.GetTime()-fStat->GetTimeFirst())*freq+rndm;// - fSpline->GetXmin();
+
+        // Sebastian Mueller and Dominik Neise on fix time offsets:
+        // We add a fix temporal offset to the relative arrival time of the 
+        // individual pixel. The offsets are stored in the
+        // fFixTimeOffsetsBetweenPixelsInNs -> fM matrix. We identify the first
+        // column to hold the offsets in ns.
+        t = t + freq*fFixTimeOffsetsBetweenPixelsInNs->fM[idx][0];
 
         // FIXME: Time jitter?

branches/MarsFixTimeOffsetBranch/msimcamera/MSimCamera.h

@@ -7 +7 @@
 
 #include "MArrayF.h"
+#include "MMatrix.h"
 
 class MMcEvt;
@@ -35 +36 @@
 
     MParameterD       *fCrosstalkCoeffParam;
+
+    MMatrix *fFixTimeOffsetsBetweenPixelsInNs; //! Container to store the fix temporal offsets for each pixel in ns
+
     MTruePhotonsPerPixelCont    *fTruePhotons;  //! Container to store the number of photons per pixel