Changeset 9319 for trunk/MagicSoft

Timestamp:

02/11/09 17:51:43 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (1 diff)
• msim/MSimMMCS.cc (added)
• msim/MSimMMCS.h (added)
• msim/Makefile (modified) (1 diff)
• msim/SimLinkDef.h (modified) (1 diff)
• msimcamera/MSimCamera.cc (modified) (10 diffs)
• msimcamera/MSimCamera.h (modified) (3 diffs)
• msimcamera/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -154 +154 @@
      - added debug output
 
+   * msimcamera/MSimCamera.[h,cc]:
+     - outsourced the pedestal and gain numbers into ReInit
+     - use an MPedestalCam for Electronic Noise and Gain
+     - allow to switch ob whether the gain is applied to the 
+       electronic noise or not
+     - SetPhotElfromShower
+
+   * msim/Makefile. msim/SimLinkDef.h:
+     - added MSimMMCS
+
+   * msim/MSimMMCS.[h,cc]:
+     - added
+
+   * msimcamera/Makefile:
+     - added -I../mpedestal
 
 

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -78 +78 @@
 #include "MWriteRootFile.h"
 
+#include "MSimMMCS.h"
 #include "MSimAbsorption.h"
 #include "MSimReflector.h"

trunk/MagicSoft/Mars/msim/Makefile

@@ -20 +20 @@
 #
 INCLUDES = -I. -I../mbase -I../mmc -I../mgeom -I../mgui -I../mcorsika \
-           -I../mpointing -I../msimreflector -I../mhbase 
+           -I../mpointing -I../msimreflector -I../mhbase -I../mraw
 
 SRCFILES = MPhotonData.cc \
            MPhotonEvent.cc \
            MHPhotonEvent.cc \
+           MSimMMCS.cc \
            MSimAbsorption.cc \
            MSimPointingPos.cc

trunk/MagicSoft/Mars/msim/SimLinkDef.h

@@ -15 +15 @@
 #pragma link C++ class MSimAbsorption+;
 
+#pragma link C++ class MSimMMCS+;
+
 #endif

trunk/MagicSoft/Mars/msimcamera/MSimCamera.cc

@@ -56 +56 @@
 #include "MPhotonData.h"
 
+#include "MPedestalCam.h"
+#include "MPedestalPix.h"
+
 #include "MAnalogSignal.h"
 #include "MAnalogChannels.h"
 
+#include "MMcEvt.hxx"            // To be replaced by a CheObs class
 #include "MRawRunHeader.h"
 
@@ -70 +74 @@
 //
 MSimCamera::MSimCamera(const char* name, const char *title)
-: fEvt(0), fStat(0), fRunHeader(0), fCamera(0), fSpline(0)//, fPulsePos(0)
+    : fEvt(0), fStat(0), fRunHeader(0), fElectronicNoise(0), fGain(0),
+    fCamera(0), fMcEvt(0), fSpline(0), fBaselineGain(kFALSE)
 {
     fName  = name  ? name  : "MSimCamera";
@@ -83 +88 @@
 Int_t MSimCamera::PreProcess(MParList *pList)
 {
+    fMcEvt = (MMcEvt*)pList->FindCreateObj("MMcEvt");
+    if (!fMcEvt)
+        return kFALSE;
+
     fCamera = (MAnalogChannels*)pList->FindCreateObj("MAnalogChannels");
     if (!fCamera)
@@ -115 +124 @@
     }
  */
+
+    // Create it here to make sure that MGeomApply will set the correct size
+    fElectronicNoise = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", "ElectronicNoise");
+    if (!fElectronicNoise)
+        return kFALSE;
+
+    fGain = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", "Gain");
+    if (!fGain)
+        return kFALSE;
+
     MPulseShape *pulse = (MPulseShape*)pList->FindObject("MPulseShape");
     if (!pulse)
@@ -122 +141 @@
     }
 
-    *fLog << warn << "FIXME - SCALE WITH THE SAMPLING FREQUENCY." << endl;
+    if (fRunHeader->GetFreqSampling()!=1000)
+    {
+        *fLog << err  << "ERROR - Sampling frequencies others than 1GHz are not yet supported." << endl;
+        *fLog << warn << "FIXME - SCALE MPulsShape WITH THE SAMPLING FREQUENCY." << endl;
+        return kFALSE;
+    }
 
     fSpline = pulse->GetSpline();
@@ -131 +155 @@
     }
 
+    // ---------------- Information output ----------------------
+
+    if (fBaselineGain)
+        *fLog << inf << "Gain is also applied to the electronic noise." << endl;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// FIXME: For now this is a workaround to set a baseline and the
+// electronic (guassian noise)
+//
+Bool_t MSimCamera::ReInit(MParList *plist)
+{
+    for (int i=0; i<fElectronicNoise->GetSize(); i++)
+    {
+        MPedestalPix &ped = (*fElectronicNoise)[i];
+        ped.SetPedestal(15*256); // Baseline at 15 like in MAGIC
+        ped.SetPedestalRms(1.5*256);//2.0); // 1.5 bit noise for a gain of 64
+        ped.SetPedestalABoffset(0);
+        ped.SetNumEvents(0);
+
+        // 256 scale from 8bit to 16bit
+        // 8 signal height of one phe
+        MPedestalPix &gain = (*fGain)[i];
+        gain.SetPedestal(8*256);
+        gain.SetPedestalRms(0); 
+        gain.SetPedestalABoffset(0);
+        gain.SetNumEvents(0);
+    }
     return kTRUE;
 }
@@ -144 +199 @@
     const Double_t freq = fRunHeader->GetFreqSampling()/1000.;
 
+    // FIXME: Should we use a higher sampling here?
+
     const Double_t start = fStat->GetTimeFirst()*freq;
     const Double_t end   = fStat->GetTimeLast() *freq;
 
     const UInt_t   nlen  = TMath::CeilNint(end-start);
-
-    // FIXME: Jitter the start point of digitization by one sample [0;1]
-    // FIXME: TAKE PULSE WIDTH out of the calculation and start at TimeFirst
 
     // Get number of pixels/channels
@@ -165 +219 @@
     for (UInt_t i=0; i<npix; i++)
     {
+        const MPedestalPix &pix = (*fElectronicNoise)[i];
+
+        const Double_t val = pix.GetPedestal();
+        const Double_t rms = pix.GetPedestalRms();
+
+        if (!fBaselineGain)
+        {
+            (*fCamera)[i].AddGaussianNoise(rms, val);
+            continue;
+        }
+        // Sorry, the name "pedestal" is misleading here
+        // FIXME: Simulate gain fluctuations
+        const Double_t gain = (*fGain)[i].GetPedestal();
+
         // FIXME: We might add the base line here already.
-        (*fCamera)[i].AddGaussianNoise(22.5/64);
+        // FIXME: How stable is the offset?
+        // FIXME: Should we write a container AppliedGain for MSImTrigger?
+        (*fCamera)[i].AddGaussianNoise(rms*gain, val*gain);
     }
 
@@ -181 +251 @@
     //        Or maybe per channel and run?
 
+    Double_t tot = 0;
+
     // Simulate pulses
     for (Int_t i=0; i<num; i++)
@@ -191 +263 @@
         // FIXME: Time jitter?
         // FIXME: Add additional routing here?
+        // FIMXE: How stable is the gain?
+
+        if (ph.GetPrimary()!=MMcEvt::kNightSky)
+            tot += ph.GetWeight();
+
+        // Sorry, the name "pedestal" is misleading here
+        // FIXME: Simulate gain fluctuations
+        const Double_t gain = (*fGain)[idx].GetPedestal();
 
         // === FIXME === FIXME === FIXME === Frequency!!!!
-        (*fCamera)[idx].AddPulse(*fSpline, t, ph.GetWeight());
-    }
+        (*fCamera)[idx].AddPulse(*fSpline, t, ph.GetWeight()*gain);
+    }
+
+    fMcEvt->SetPhotElfromShower(TMath::Nint(tot));
 
     return kTRUE;
 }
-
-/*
-MSimCameraFiles::Process()
-{
-    // fCorsikaHeader->GetEvtNumber()   -->   fMcEvt->SetEvtNumber()
-    // fCorsikaHeader->GetTotalEnergy() -->   fMcEvt->SetEnergy()
-    // fCorsikaHeader->GetParticleID()  -->   fMcEvt->SetParticleID()
-    // fCorsikaHeader->GetImpact()      -->   fMcEvt->SetImpact()
-    // fCorsikaHeader->GetTheta()       -->   fMcEvt->SetTheta()
-    // fCorsikaHeader->GetPhi()         -->   fMcEvt->SetPhi()
-    // fPointingPos->GetTheta()         -->   fMcEvt->SetTelescopeTheta()
-    // fPointingPos->GetPhi()           -->   fMcEvt->SetTelescopePhi()
-    // fStats->GetTimeFirst()           -->   fMcEvt->SetTimeFirst()
-    // fStats->GetTimeLast()            -->   fMcEvt->SetTimeLast()
-    //                                        fMcEvt->SetReuse()
-    // MMcCorsikaRunHeader: fSlopeSpec, fELowLim, fEUppLim;
-
-    fMcEvt->Fill(*fCorsikaHeader, *fPointingPos, *fStats);
-
-    return kTRUE;
-}
-*/
-

trunk/MagicSoft/Mars/msimcamera/MSimCamera.h

@@ -6 +6 @@
 #endif
 
+class MMcEvt;
 class MParList;
 class MPhotonEvent;
@@ -11 +12 @@
 class MRawRunHeader;
 class MAnalogChannels;
+class MPedestalCam;
 
 class MSpline3;
@@ -17 +19 @@
 {
 private:
-    MPhotonEvent      *fEvt;        //! Event stroing the photons
-    MPhotonStatistics *fStat;       //! Valid time range of the phootn event
-    MRawRunHeader     *fRunHeader;  //! Sampling frequency
+    MPhotonEvent      *fEvt;             //! Event stroing the photons
+    MPhotonStatistics *fStat;            //! Valid time range of the phootn event
+    MRawRunHeader     *fRunHeader;       //! Sampling frequency
+    MPedestalCam      *fElectronicNoise; //! Electronic noise (baseline and rms)
+    MPedestalCam      *fGain;            //! Electronic noise (baseline and rms)
 
-    MAnalogChannels   *fCamera;     //! Output of the analog signals
+    MAnalogChannels   *fCamera;          //! Output of the analog signals
+    MMcEvt            *fMcEvt;           //! For information stored in MMcEvt
 
-    MSpline3 *fSpline;
+    MSpline3 *fSpline;     // Pusle Shape
+
+    Bool_t fBaselineGain;  // Should the gain be applied to baseline and electronic noise?
 
     // MTask
-    Int_t PreProcess(MParList *pList);
-    Int_t Process();
+    Int_t  PreProcess(MParList *pList);
+    Bool_t ReInit(MParList *pList);
+    Int_t  Process();
 
 public:

trunk/MagicSoft/Mars/msimcamera/Makefile

@@ -21 +21 @@
 INCLUDES = -I. -I../mbase -I../mgeom -I../msim -I../msignal -I../mcorsika \
            -I../mmc -I../mgui -I../mcalib -I../mraw -I../mfileio -I../melectronics \
-           -I../mtrigger
+           -I../mtrigger -I../mpedestal
 
 SRCFILES = MSimPSF.cc \