Changeset 9574 for trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc

Timestamp:

04/21/10 16:46:18 (14 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc

@@ -422 +422 @@
         return sig ? sig->GetStart() : -1;
     }
+    Int_t GetFirstIndex() const
+    {
+        MDigitalSignal *sig = static_cast<MDigitalSignal*>(fSignals[0]);
+        return sig ? sig->GetIndex() : -1;
+    }
     Bool_t GetPixelContent(Double_t&, Int_t, const MGeomCam&, Int_t) const
     {
@@ -441 +446 @@
 
 
-void MSimTrigger::SetTrigger(Double_t pos)
+void MSimTrigger::SetTrigger(Double_t pos, Int_t idx)
 {
     // FIXME: Jitter! (Own class?)
@@ -453 +458 @@
     // Flag this event as triggered by the lvl1 trigger (FIXME?)
     fEvtHeader->SetTriggerPattern(pos<0 ? 0 : pat);
+    fEvtHeader->SetNumTrigLvl1((UInt_t)idx);
     fEvtHeader->SetReadyToSave();
 }
@@ -473 +479 @@
     if (!fSimulateElectronics)
     {
-        SetTrigger(min);
+        SetTrigger(min, -1);
         return kTRUE;
     }
@@ -611 +617 @@
             }
 
-            // Set trigger channel index
-            ttl->SetIndex(j);
+            // Set trigger-channel index to keep this information
+            //ttl->SetIndex(j);
         }
 
@@ -623 +629 @@
         // FIXME: Simulate trigger dead-time!
         if (arr->GetEntriesFast()>0)
-            triggers.Add(static_cast<MDigitalSignal*>(arr->RemoveAt(0)));
+        {
+            ttl = static_cast<MDigitalSignal*>(arr->RemoveAt(0));
+            // Set trigger-channel index to keep this information
+            ttl->SetIndex(j);
+            triggers.Add(ttl);
+        }
 
         // delete the allocated space
@@ -636 +647 @@
     // FIXME: Store triggers! (+ Reversed pixels?)
 
-    SetTrigger(triggers.GetFirstTrigger());
+    SetTrigger(triggers.GetFirstTrigger(), triggers.GetFirstIndex());
 
     // No trigger issued. Go on.