Changeset 5725 for trunk

Timestamp:

01/07/05 17:31:15 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mraw/MRawEvtPixelIter.cc (modified) (8 diffs)
• mtrigger/MFTriggerPattern.cc (added)
• mtrigger/MFTriggerPattern.h (added)
• mtrigger/MTriggerPattern.cc (added)
• mtrigger/MTriggerPattern.h (added)
• mtrigger/MTriggerPatternDecode.cc (added)
• mtrigger/MTriggerPatternDecode.h (added)
• mtrigger/Makefile (modified) (2 diffs)
• mtrigger/TriggerLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -65 +65 @@
      - a small acceleration discussed with Hendrik by replacing a
        counter in a loop by pointer arithmetics
+
+   * mraw/MRawEvtPixelIter.cc:
+     - fixed a bug in GetMaxIdxHiLoGain which caused the loop to
+       read one byte behind the end of the array
+
+   * mtrigger/MTriggerPattern.[h,cc], mtrigger/MTriggerPatternDecode.[h,cc],
+     mtrigger/MFTriggerPattern.[h,cc]:
+     - added
+
+   * mtrigger/Makefile, mtrigger/TriggerLinkDef.h:
+     - added MTriggerPattern, MTriggerPatternDecode and MFTriggerPattern
 
 

trunk/MagicSoft/Mars/NEWS

@@ -24 +24 @@
 
    - added possibility to read a TTree stored only in memory by MReadTree
+
+   - new classes to deal with the interleaved calibration events:
+     MTriggerPattern, MTriggerPatternDecode and MFTriggerPattern
 
 

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -160 +160 @@
     //
     Byte_t *ptr = fHiGainPos;
-    const Byte_t *end = ptr + fNumHiGainSamples;
+    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
 
     ULong_t sum=0;
@@ -180 +180 @@
     //
     Byte_t *ptr = fHiGainPos;
-    const Byte_t *end = ptr + fNumHiGainSamples;
+    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
 
     ULong_t sum=0;
@@ -197 +197 @@
 {
     Byte_t *ptr = fHiGainPos;
-    const Byte_t *end = ptr + fNumHiGainSamples;
+    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
 
     ULong_t sum=0;
@@ -219 +219 @@
     Byte_t *ptr = fHiGainPos+1;
     Byte_t *max = fHiGainPos;
-    const Byte_t *end = ptr + fNumHiGainSamples;
+    const Byte_t *end = fHiGainPos + fNumHiGainSamples;
 
     do if (*ptr>*max) max = ptr;
@@ -235 +235 @@
 Short_t MRawEvtPixelIter::GetIdxMaxLoGainSample(const Byte_t lofirst) const
 {
-
-  if (!HasLoGain())
-    return -1; // means: not found
-  
-  Byte_t *ptr = fLoGainPos+lofirst+1;
-  Byte_t *max = fLoGainPos+lofirst;
-  const Byte_t *end = fLoGainPos + fNumLoGainSamples;
-        
-  do if (*ptr>*max) max = ptr;
-  while (++ptr != end);
-  
-  return max-fLoGainPos;
+    if (!HasLoGain())
+        return -1; // means: not found
+
+    Byte_t *ptr = fLoGainPos+lofirst+1;
+    Byte_t *max = fLoGainPos+lofirst;
+    const Byte_t *end = fLoGainPos + fNumLoGainSamples;
+
+    do if (*ptr>*max) max = ptr;
+    while (++ptr != end);
+
+    return max-fLoGainPos;
 }
 
@@ -292 +291 @@
 Byte_t MRawEvtPixelIter::GetMaxLoGainSample() const
 {
-
     Byte_t max = 0;
 
@@ -316 +314 @@
 
     Byte_t *ptr = fLoGainPos;
-    const Byte_t *end = ptr + fNumLoGainSamples;
+    const Byte_t *end = fLoGainPos + fNumLoGainSamples;
 
     ULong_t sum=0;
@@ -339 +337 @@
 
     Byte_t *ptr = fLoGainPos;
-    const Byte_t *end = ptr + fNumLoGainSamples;
+    const Byte_t *end = fLoGainPos + fNumLoGainSamples;
 
     ULong_t sum=0;

trunk/MagicSoft/Mars/mtrigger/Makefile

@@ -19 +19 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mgui
+INCLUDES = -I. -I../mbase -I../mgui -I../mraw -I../mcalib
 
 SRCFILES = MTriggerIPR.cc \
@@ -25 +25 @@
            MTriggerBit.cc\
            MTriggerPrescFact.cc\
-           MTriggerLiveTime.cc
+           MTriggerLiveTime.cc \
+           MTriggerPattern.cc \
+           MTriggerPatternDecode.cc \
+           MFTriggerPattern.cc
 
 ############################################################

trunk/MagicSoft/Mars/mtrigger/TriggerLinkDef.h

@@ -11 +11 @@
 #pragma link C++ class MTriggerLiveTime+;
 
+#pragma link C++ class MTriggerPattern+;
+#pragma link C++ class MTriggerPatternDecode+;
+#pragma link C++ class MFTriggerPattern+;
+
 #endif