Changeset 9264 for trunk/MagicSoft/Mars

Timestamp:

01/25/09 17:27:05 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msimcamera/MSimTrigger.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -82 +82 @@
    * msimcamera/MSimTrigger.[h,cc]:
      - added ReadEnv for setup from a resource file
+     - compress the trigger list after deleting slots
+     - initialize descriminator threshold with -1
+     - check for the validity of the discr. th in PreProcess
 
    * msimreflector/MReflector.[h,cc]:

trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc

@@ -78 +78 @@
 //
 MSimTrigger::MSimTrigger(const char *name, const char *title)
-    : fCamera(0), fPulsePos(0), fTrigger(0), fRunHeader(0), fEvtHeader(0)
+    : fCamera(0), fPulsePos(0), fTrigger(0), fRunHeader(0), fEvtHeader(0),
+    fDiscriminatorThreshold(-1)
 {
     fName  = name  ? name  : "MSimTrigger";
@@ -169 +170 @@
     if (fCoincidenceMap.ReadFile(fNameCoincidenceMap)<0)
         return kFALSE;
+
+    if (fDiscriminatorThreshold<=0)
+    {
+        *fLog << err << "ERROR - Discriminator threshold " << fDiscriminatorThreshold << " invalid." << endl;
+        return kFALSE;
+    }
+
+    *fLog << inf << "Using discriminator threshold of " << fDiscriminatorThreshold << endl;
 
     return kTRUE;
@@ -260 +269 @@
                 delete arr->Remove(ttl);
 
+        // Remove the empty slots
+        arr->Compress();
+
         // If we have at least one trigger keep the earliest one.
         // FIXME: The triggers should be ordered in time automatically: To be checked!
@@ -280 +292 @@
     triggers.Sort();
 
+    // inf2?
+    *fLog << all;
+    *gLog << triggers.GetEntriesFast() << " triggers in " << triggers.GetEntriesFast() << " patches.";
+    *fLog << endl;
+
     // FIXME: Jitter! (Own class?)
     fTrigger->SetVal(static_cast<MDigitalSignal*>(triggers[0])->GetStart());
 
-
-    // inf2?
-    *fLog << all << triggers.GetEntriesFast() << " triggers in " << triggers.GetEntriesFast() << " patches." << endl;
 
     return kTRUE;