Changeset 17663

Timestamp:

04/07/14 15:05:14 (11 years ago)

Author:

ftemme

Message:

Added the creation of a MTruePhotonsPerPixelCont in MSimCamera and the filling of the arrays of the container. Also added the container to the fitsoutput

Location:

trunk/Mars

Files:

• mjobs/MJSimulation.cc (modified) (4 diffs)
• msimcamera/MSimCamera.cc (modified) (4 diffs)
• msimcamera/MSimCamera.h (modified) (3 diffs)

trunk/Mars/mjobs/MJSimulation.cc

@@ -350 +350 @@
 Bool_t MJSimulation::Process(const MArgs &args, const MSequence &seq)
 {
-    /*
-    if (!fSequence.IsValid())
-    {
-        *fLog << err << "ERROR - Sequence invalid!" << endl;
-        return kFALSE;
-    }
-    */
-
-//    if (!HasWritePermission(CombinePath(fPathOut, GetOutFile(seq))))
-//        return kFALSE;
-
     *fLog << inf;
     fLog->Separator(GetDescriptor());
@@ -381 +370 @@
 
     // --------------------------------------------------------------------------------
-
     // Setup Parlist
     MParList plist;
     plist.AddToList(this); // take care of fDisplay!
-
     // setup TaskList
     MTaskList tasks;
     plist.AddToList(&tasks);
-
     // --------------------------------------------------------------------------------
 
@@ -444 +430 @@
     header.SetObservation("On", "MonteCarlo");
     plist.AddToList(&header);
-    // ++++++++ FIXME FIXME FIXME +++++++++++++
-
-    /*
-    MPedestalCam pedcam;
-    pedcam.Init(geomcam.GetNumPixels());
-    for (UInt_t i=0; i<geomcam.GetNumPixels(); i++)
-        pedcam[i].Set(128./header.GetScale(), 22.5/header.GetScale());
-    plist.AddToList(&pedcam);
-    */
-
-    // -------------------------------------------------------------------
 
     MCorsikaRead read;
@@ -677 +652 @@
     write3af.AddContainer("IntendedPulsePos", "RunHeaders");
     write3af.AddContainer("MRawEvtData",      "Events");
+    write3af.AddContainer("MTruePhotonsPerPixelCont", "Events");
     
     if (fOperationMode == kModeData){

trunk/Mars/msimcamera/MSimCamera.cc

@@ -47 +47 @@
 #include "MLogManip.h"
 
+#include "MTruePhotonsPerPixelCont.h"
+
 #include "MSpline3.h"
 #include "MParSpline.h"
@@ -149 +151 @@
     {
         *fLog << err << "CrosstalkCoeffParam [MParameterD] not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fTruePhotons = (MTruePhotonsPerPixelCont*)pList->FindCreateObj("MTruePhotonsPerPixelCont");
+    if (!fTruePhotons)
+    {
+        *fLog << err << "MTruePhotonsPerPixelCont not found... aborting." << endl;
         return kFALSE;
     }
@@ -344 +353 @@
 
         if (ph.GetPrimary()!=MMcEvt::kNightSky && ph.GetPrimary()!=MMcEvt::kArtificial)
+        {
             tot += ph.GetWeight();
+            (*fTruePhotons->cherenkov_photons_weight)[idx] += ph.GetWeight();
+            (*fTruePhotons->cherenkov_photons_number)[idx] += 1;
+
+            (*fTruePhotons->cherenkov_arrival_time_mean)[idx] += t;
+            (*fTruePhotons->cherenkov_arrival_time_variance)[idx] += t*t;
+
+            if (ph.GetPrimary()==MMcEvt::kMUON)
+            {
+                (*fTruePhotons->muon_cherenkov_photons_weight)[idx] += ph.GetWeight();
+                (*fTruePhotons->muon_cherenkov_photons_number)[idx] += 1;
+            }
+
+            // find min
+            if (t < (*fTruePhotons->cherenkov_arrival_time_min)[idx] )
+            {
+                (*fTruePhotons->cherenkov_arrival_time_min)[idx] = t;
+            }
+            // find max
+            if (t > (*fTruePhotons->cherenkov_arrival_time_max)[idx] )
+            {
+               (*fTruePhotons->cherenkov_arrival_time_max)[idx] = t;
+            }
+        }
+        else
+        {
+            (*fTruePhotons->noise_photons_weight)[idx] += ph.GetWeight();
+        }
 
         // Sorry, the name "pedestal" is misleading here
@@ -352 +389 @@
         // === FIXME === FIXME === FIXME === Frequency!!!!
         (*fCamera)[idx].AddPulse(*fSpline, t, ph.GetWeight()*gain);
+    }
+
+    for (unsigned int i=0 ; i < 1440 ; i++)
+    {
+        float number = (*fTruePhotons->cherenkov_photons_number)[i];
+        (*fTruePhotons->cherenkov_arrival_time_mean)[i] /= number;
+        float mean = (*fTruePhotons->cherenkov_arrival_time_mean)[i];
+        float sum_tt = (*fTruePhotons->cherenkov_arrival_time_variance)[i];
+        (*fTruePhotons->cherenkov_arrival_time_variance)[i] = (sum_tt / number - mean*mean) /(number - 1);
     }
 

trunk/Mars/msimcamera/MSimCamera.h

@@ -5 +5 @@
 #include "MTask.h"
 #endif
+
+#include "MArrayF.h"
 
 class MMcEvt;
@@ -13 +15 @@
 class MAnalogChannels;
 class MPedestalCam;
+class MArrayF;
+class MTruePhotonsPerPixelCont;
 
 class MSpline3;
@@ -31 +35 @@
 
     MParameterD       *fCrosstalkCoeffParam;
+    MTruePhotonsPerPixelCont    *fTruePhotons;  //! Container to store the number of photons per pixel
 
     const MSpline3    *fSpline;          // Pulse Shape