Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 9479)
+++ trunk/MagicSoft/Mars/Changelog	(revision 9480)
@@ -18,4 +18,19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2009/07/28 Thomas Bretz
+
+   * mjobs/MJCalibration.cc:
+     - we have to allow all kind of triggers together with a 
+       calibration trigger, otherwise we never have enough 
+       calibration events if the trigger signals haven't been
+       switched off (prescaled)
+
+   * mtrigger/MTriggerPatternDecode.cc:
+     - when we move L1TPU to L1 as a workaround we now really "move"
+       the bit instead of just copy it (this is better for filters
+       like "deny all")
+
+
 
  2009/07/04 Daniela Dorner
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 9479)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 9480)
@@ -1401,12 +1401,12 @@
     MFTriggerPattern          fcalib("CalibFilter");
     fcalib.SetDefault(kFALSE);
-    fcalib.AllowAll(MFTriggerPattern::kPrescaled);
-    fcalib.AllowAll(MFTriggerPattern::kUnPrescaled);
-    fcalib.DenyTriggerLvl1(MFTriggerPattern::kUnPrescaled);
-    fcalib.DenyTriggerLvl1(MFTriggerPattern::kPrescaled);
-    fcalib.DenyTriggerLvl2(MFTriggerPattern::kUnPrescaled);
-    fcalib.DenyTriggerLvl2(MFTriggerPattern::kPrescaled);
-    fcalib.DenySumTrigger(MFTriggerPattern::kUnPrescaled);
-    fcalib.DenySumTrigger(MFTriggerPattern::kPrescaled);
+    fcalib.DenyAll(MFTriggerPattern::kPrescaled);
+    fcalib.DenyAll(MFTriggerPattern::kUnPrescaled);
+    fcalib.AllowTriggerLvl1(MFTriggerPattern::kUnPrescaled);
+    fcalib.AllowTriggerLvl1(MFTriggerPattern::kPrescaled);
+    fcalib.AllowTriggerLvl2(MFTriggerPattern::kUnPrescaled);
+    fcalib.AllowTriggerLvl2(MFTriggerPattern::kPrescaled);
+    fcalib.AllowSumTrigger(MFTriggerPattern::kUnPrescaled);
+    fcalib.AllowSumTrigger(MFTriggerPattern::kPrescaled);
     fcalib.RequireCalibration(MFTriggerPattern::kPrescaled);
     fcalib.RequireCalibration(MFTriggerPattern::kUnPrescaled);
Index: trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc
===================================================================
--- trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc	(revision 9479)
+++ trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc	(revision 9480)
@@ -133,4 +133,8 @@
     fPattern->fUnprescaled = (pattern>>8) & 0xff;
 
+    cout << (int)((pattern>>6)&1) << " " << fPattern->fPrescaled << endl;
+
+    fPattern->Print();
+
     // This is a workaround for the new scheme in which L1TPU (the signal
     // comming directly from the L1 is connected, but the L1 (routed
@@ -141,5 +145,10 @@
         fPattern->fPrescaled   |= (pattern>> 6)&1;
         fPattern->fUnprescaled |= (pattern>>14)&1;
+
+        fPattern->fPrescaled   &= 0xbf;
+        fPattern->fUnprescaled &= 0xbf;
     }
+
+    fPattern->Print();
 
     return kTRUE;