Changeset 8952 for trunk

Timestamp:

06/14/08 00:29:53 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillsignal.C (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (2 diffs)
• mtrigger/MFTriggerPattern.cc (modified) (4 diffs)
• mtrigger/MFTriggerPattern.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
    * datacenter/macros/fillcalib.C:
      - fixed a bug introduced by the usage of InserUpdate
+
+   * datacenter/macros/fillsignal.C:
+     - fixed a type (the wrong number was printed to the console)
+
+   * mjobs/MJCalibrateSignal.cc:
+     - let all calibration triggered events pass to calibration
+
+   * mtrigger/MFTriggerPattern.[h,cc]:
+     - count a bit more to increase the printed amout of 
+       information at the end
 
 

trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C

@@ -330 +330 @@
     cout << "  UnsuitableMax (99.9%)   " << setw(6) << unsuitablemax << endl;
     cout << "  DeadMax                 " << setw(6) << deadmax << endl;
-    cout << "  Rate Trigger       [Hz] "  << rateped  << endl;
+    cout << "  Rate Trigger       [Hz] "  << ratetrig << endl;
     cout << "  Rate SUM           [Hz] "  << ratesum  << endl;
     cout << "  Rate Ped+Trigger   [Hz]  " << rateped2 << endl;

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -515 +515 @@
     // Deny or allow is done before prescaling.
     //
-    MFTriggerPattern fped;
+    MFTriggerPattern fped("SelectPedestals");
     fped.SetDefault(kTRUE);
     fped.DenyCalibration();
@@ -580 +580 @@
     fcalib.DenyAll();
     fcalib.RequireCalibration();
+    fcalib.AllowTriggerLvl1();
+    fcalib.AllowTriggerLvl2();
+    fcalib.AllowSumTrigger();
 
     MCalibrationChargeCalc  chcalc;

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.cc

@@ -101 +101 @@
 //
 // If Prescaled and Unprescaled pattern is 0 return default.
-// If all bits of the fMaskRequired* mask are found in the pattern set
-// fResult to true.
+//
+// If at least all bits in the fMaskRequired* mask are found in the
+// trigger pattern set fResult to true. This means that is the required
+// mask is 0 the dafult is changed from false to true.
+//
 // If any bit matches the fMasDenied* mask fResult is forced to be false.
 //
-Int_t MFTriggerPattern::Eval() const
+Int_t MFTriggerPattern::Eval()
 {
     const Byte_t p = fPattern->GetPrescaled();
@@ -111 +114 @@
     if (p==0 && u==0)
     {
+        fCounter[2]++;
         return fDefault;
     }
@@ -123 +127 @@
     // Now overwrite the result if one of the bits is denied
     if ( (p & fMaskDeniedPrescaled) || (u & fMaskDeniedUnprescaled) )
+    {
+        fCounter[3]++;
         return kFALSE;
+    }
 
     return rc;
@@ -155 +162 @@
     *fLog << dec << setfill(' ');
 
-    *fLog << " " << setw(7) << fCounter[0] << " (" << setw(3) ;
+    *fLog << "  " << setw(7) << fCounter[2] << " (" << setw(3);
+    *fLog << (int)(fCounter[2]*100/n);
+    *fLog << "%) Default (" << (fDefault?"true":"false") << ") returned." << endl;
+
+    *fLog << "  " << setw(7) << fCounter[3] << " (" << setw(3);
+    *fLog << (int)(fCounter[3]*100/n);
+    *fLog << "%) Trigger denied." << endl;
+
+    *fLog << " " << setw(7) << fCounter[0] << " (" << setw(3);
     *fLog << (int)(fCounter[0]*100/n);
     *fLog << "%) Accepted trigger pattern." << endl;
 
-    *fLog << " " << setw(7) << fCounter[1] << " (" << setw(3) ;
+    *fLog << " " << setw(7) << fCounter[1] << " (" << setw(3);
     *fLog << (int)(fCounter[1]*100/n);
     *fLog << "%) Rejected trigger pattern!" << endl;

trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.h

@@ -31 +31 @@
 
   Bool_t fResult;                   //! Calculated result to be returned by IsExpressionTrue
-  Int_t  fCounter[2];               //! Counter for results
+  Int_t  fCounter[4];               //! Counter for results
 
   // MFTriggerPattern
@@ -38 +38 @@
   void Allow(const Byte_t mask, Prescale_t prescaled=kUnPrescaled);
 
-  Int_t Eval() const;
+  Int_t Eval();
 
   // MTask