Changeset 9308 for trunk/MagicSoft/Mars/msimcamera

Timestamp:

02/09/09 11:30:54 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msimcamera

Files:

• MSimGeomCam.cc (modified) (1 diff)
• MSimReadout.cc (modified) (3 diffs)
• MSimReadout.h (modified) (2 diffs)
• MSimTrigger.cc (modified) (12 diffs)
• MSimTrigger.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc

@@ -170 +170 @@
     }
 
+    const Float_t freq = fHeader->GetFreqSampling()/1000.;
+
+    // We add an additional sample at the end to support a possible shift
+    // of the start time of the first event by 0 to 1 sample.
+    const Int_t   ns   = fHeader->GetNumSamplesHiGain()+1;
+
     const Float_t first = cnt>0 ? fEvt->GetFirst()->GetTime() :  0;
-    const Float_t last  = cnt>0 ? fEvt->GetLast()->GetTime()  : -1;
+    const Float_t last  = cnt>0 ? fEvt->GetLast()->GetTime()  : ns*freq;
 
     // Length (ns), Pulse position (Units ns)
-    const Float_t ns = fHeader->GetFreqSampling()/1000.*fHeader->GetNumSamplesHiGain();
-    const Float_t pp = fPulsePos->GetVal();
-    const Float_t pw = fPulse->GetPulseWidth();
-
-    fStat->SetTime(first-pp-pw, last+(ns-pp)+pw);
+    const Float_t pp   = fPulsePos->GetVal();
+    const Float_t pw   = fPulse->GetPulseWidth();
+
+    fStat->SetTime(first-pp-pw, last-pp+pw + ns*freq);
     fStat->SetMaxIndex(fGeom->GetNumPixels()-1);
     fStat->SetReadyToSave();

trunk/MagicSoft/Mars/msimcamera/MSimReadout.cc

@@ -73 +73 @@
 //
 MSimReadout::MSimReadout(const char* name, const char *title)
-: fRunHeader(0), fCamera(0), fPulsePos(0), fTrigger(0), fData(0)
+: fRunHeader(0), fEvtHeader(0), fCamera(0), fPulsePos(0), fTrigger(0), fData(0)
 {
     fName  = name  ? name  : "MSimReadout";
@@ -113 +113 @@
         return kFALSE;
     }
+
+    fEvtHeader = (MRawEvtHeader*)pList->FindCreateObj("MRawEvtHeader");
+    if (!fEvtHeader)
+        return kFALSE;
 
     fData = (MRawEvtData*)pList->FindCreateObj("MRawEvtData");
@@ -244 +248 @@
     fData->SetReadyToSave();
 
+    // Set the trigger/daq event number
+    fEvtHeader->SetDAQEvtNumber(GetNumExecutions());
+    fEvtHeader->SetReadyToSave();
+
     // FIMXE: This will never be stored correctly :(
     fRunHeader->SetNumEvents(fRunHeader->GetNumEvents()+1);

trunk/MagicSoft/Mars/msimcamera/MSimReadout.h

@@ -10 +10 @@
 class MRawEvtData;
 class MRawRunHeader;
+class MRawEvtHeader;
 class MAnalogChannels;
 
@@ -16 +17 @@
 private:
     MRawRunHeader    *fRunHeader;  //! Digitization window and frequency
+    MRawEvtHeader    *fEvtHeader;  //! Event header which is filled with the event number
     MAnalogChannels  *fCamera;     //! Analog channes to be read out
     MParameterD      *fPulsePos;   //! Intended pulse position

trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc

@@ -36 +36 @@
 // is calculated using a threshold and optional a fixed digital signal length.
 //
+// The signal length of the digital signal emitted by the discriminator
+// can either be bound to the time the signal is above the threshold
+// defined by fDiscriminatorThreshold if fDigitalSignalLength<0 or set to a
+// fixed length (fDigitalSignalLength>0).
+//
 // With a second look-up table fCoincidenceMap the analog channels are
-// checked for coincidences. The earliest coincide is then stored as
+// checked for coincidences. The coincidense must at least be of the length
+// defined by fCoincidenceTime. The earliest coincide is then stored as
 // trigger position.
+//
+//
+// For MAGIC1:
+//  - fDigitalSignalLength between 6ns and 12ns
+//  - fCoincidenceTime between 0.25ns to 1ns
 //
 //
@@ -69 +80 @@
 #include "MDigitalSignal.h"
 
+#include "MTriggerPattern.h"
+
 ClassImp(MSimTrigger);
 
@@ -79 +92 @@
 MSimTrigger::MSimTrigger(const char *name, const char *title)
     : fCamera(0), fPulsePos(0), fTrigger(0), fRunHeader(0), fEvtHeader(0),
-    fDiscriminatorThreshold(-1)
+    fDiscriminatorThreshold(-1), fDigitalSignalLength(8), fCoincidenceTime(0.5)
 {
     fName  = name  ? name  : "MSimTrigger";
@@ -189 +202 @@
     fTrigger->SetVal(-1);
 
-    // FIXME: Set from somewhere else? (see also MSimCalibrationSignal)
-    fEvtHeader->SetDAQEvtNumber(GetNumExecutions());
-    fEvtHeader->SetReadyToSave();
-
     // ================== Simulate channel bundling ====================
 
@@ -204 +213 @@
         for (UInt_t j=0; j<row.GetSize(); j++)
         {
+            // FIXME: Simulate clipping
             const UInt_t idx = row[j];
             patches[i].AddSignal((*fCamera)[idx]);
@@ -216 +226 @@
     ttls.SetOwner();
 
-        // MAGIC: Constant length of signals between 6ns and 12ns
-    const Double_t siglen = 8; // Signal length (-1: As long as Signal-above-Threshold)
-
     for (UInt_t i=0; i<npatch; i++)
-        ttls.AddAt(patches[i].Discriminate(fDiscriminatorThreshold, siglen), i);
+        ttls.AddAt(patches[i].Discriminate(fDiscriminatorThreshold, fDigitalSignalLength), i);
 
     // FIXME: Write TTLs!
@@ -235 +242 @@
     const Float_t max = fCamera->GetValidRangeMax()-(nsamp-pulspos);
 
-    // Define gate time (minimum coincidence time)
-    const Double_t gate = 1; // MAGIC: minimum coincidence time 0.25ns to 1ns,
-
     // Create an array for the individual triggers
     TObjArray triggers;
@@ -258 +262 @@
         {
             TObjArray *res = CalcCoincidence(*arr, *static_cast<TObjArray*>(ttls[idx[k]]),
-                                             gate);
+                                             fCoincidenceTime);
 
             // Delete the original array and keep the new one
@@ -303 +307 @@
     {
         if (rmlo>0 || rmhi>0)
-            *fLog << all << rmlo << "/" << rmhi << " trigger out of valid range. No trigger raised." << endl;
+            *fLog << inf2 << rmlo << "/" << rmhi << " trigger out of valid range. No trigger raised." << endl;
         return kTRUE;
     }
@@ -315 +319 @@
     // FIXME: Jitter! (Own class?)
     fTrigger->SetVal(static_cast<MDigitalSignal*>(triggers[0])->GetStart());
+    fTrigger->SetReadyToSave();
+
+    // Flag this event as triggered by the lvl1 trigger (FIXME?)
+    fEvtHeader->SetTriggerPattern((UInt_t)~(MTriggerPattern::kTriggerLvl1 | (MTriggerPattern::kTriggerLvl1<<8)));
+    fEvtHeader->SetReadyToSave();
 
     // inf2?
-    *fLog << all;
+    *fLog << inf;
     *fLog << cnt << " triggers left in " << triggers.GetEntriesFast() << " patches (" << rmlo << "/" << rmhi << " trigger out of valid range), T=" << fTrigger->GetVal();
     *fLog << endl;
@@ -329 +338 @@
 // FileNameCoincidenceMap:  coincidence.txt
 // DiscriminatorTheshold:   3.5
+// DigitalSignalLength:     8
+// CoincidenceTime:         0.5
 //
 Int_t MSimTrigger::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
@@ -351 +362 @@
     }
 
+    if (IsEnvDefined(env, prefix, "DigitalSignalLength", print))
+    {
+        rc = kTRUE;
+        fDigitalSignalLength = GetEnvValue(env, prefix, "DigitalSignalLength", fDigitalSignalLength);
+    }
+
+    if (IsEnvDefined(env, prefix, "CoincidenceTime", print))
+    {
+        rc = kTRUE;
+        fCoincidenceTime = GetEnvValue(env, prefix, "CoincidenceTime", fCoincidenceTime);
+    }
+
     return rc;
 }

trunk/MagicSoft/Mars/msimcamera/MSimTrigger.h

@@ -32 +32 @@
 
     Float_t fDiscriminatorThreshold;  // Discriminator threshold
+    Float_t fDigitalSignalLength;     // Length of the output of the discriminator
+    Float_t fCoincidenceTime;         // Minimum coincidence time (gate)
 
     // MSimTrigger
@@ -50 +52 @@
 
     void SetDiscriminatorThreshold(Float_t th) { fDiscriminatorThreshold=th; }
+    void SetDigitalSignalLength(Float_t ln) { fDigitalSignalLength=ln; }
+    void SetCoincidenceTime(Float_t tm) { fCoincidenceTime=tm; }
 
     ClassDef(MSimTrigger, 0) // Task to simulate trigger electronics

trunk/MagicSoft/Mars/msimcamera/Makefile

@@ -20 +20 @@
 #
 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../mmc -I../mgui -I../mcalib -I../mraw -I../mfileio -I../melectronics \
+           -I../mtrigger
 
 SRCFILES = MSimPSF.cc \