Changeset 6014

Timestamp:

01/26/05 08:40:22 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtHeader.cc (modified) (1 diff)
• MRawEvtHeader.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -408 +408 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// return power of continous light, see class reference
-//
-UShort_t MRawEvtHeader::GetPowerOfContLight() const
-{
-  return fTrigPattern[1] & 0xff;
-}
-
-// --------------------------------------------------------------------------
-//
-// return pulser slot patter as a 17-bit-field
-//
 UInt_t MRawEvtHeader::GetPulserSlotPattern() const
 {
-  return (fTrigPattern[1] >> 16) & 0x1ffff;
-}
-
-// --------------------------------------------------------------------------
-//
-// return colour of the pulsed light as an MCalibrationCam::PulserColor_t
-// ATTENTION: In case of mulitple colours, kNONE is returned
-//
-const MCalibrationCam::PulserColor_t MRawEvtHeader::GetPulserColor() const 
-{
-
-  const UInt_t pattern = GetPulserSlotPattern();
-  
-  if ((pattern & kGreenAndBlue) || (pattern & kBlueAndUV) || (pattern & kGreenAndUV))
-    return MCalibrationCam::kNONE;
-
-  if (pattern & kCT1Pulser)
-    return MCalibrationCam::kCT1;
-  if (pattern & kAnyUV)
-    return MCalibrationCam::kUV;
-  if (pattern & kAnyGreen)
-    return MCalibrationCam::kGREEN;
-  if (pattern & kAnyBlue)
-    return MCalibrationCam::kBLUE;
-
-  return MCalibrationCam::kNONE;
-}
-
-
-// --------------------------------------------------------------------------
-//
-// return strength of the pulsed light
-// ATTENTION: In case of mulitple colours, kNONE is returned
-// 
-Float_t MRawEvtHeader::GetPulserStrength() const 
-{
-
-  const MCalibrationCam::PulserColor_t col = GetPulserColor();
-  const UInt_t pattern = GetPulserSlotPattern();
-
-  Float_t strength = 0.;
-
-  switch (col)
-    {
-    case MCalibrationCam::kNONE:
-      break;
-    case MCalibrationCam::kGREEN:
-        if (pattern & kSlot1Green)
-          strength += 5.;
-        if (pattern & kSlot2Green)
-          strength += 2.;
-        if (pattern & kSlot15Green)
-          strength += 1.;
-        if (pattern & kSlot16AttGreen)
-          strength += 0.2;
-      break;      
-    case MCalibrationCam::kBLUE:
-        if (pattern & kSlot3Blue)
-          strength += 5.;
-        if (pattern & kSlot6Blue)
-          strength += 5.;
-        if (pattern & kSlot7Blue)
-          strength += 5.;
-        if (pattern & kSlot8Blue)
-          strength += 2.;
-        if (pattern & kSlot9AttBlue)
-          strength += 0.2;
-        if (pattern & kSlot10Blue)
-          strength += 0.;
-        if (pattern & kSlot11Blue)
-          strength += 1.;
-        if (pattern & kSlot14Blue)
-          strength += 5.;
-      break;      
-    case MCalibrationCam::kUV:
-        if (pattern & kSlot4UV)
-          strength += 1.;
-        if (pattern & kSlot5UV)
-          strength += 2.;
-        if (pattern & kSlot12UV)
-          strength += 5.;
-        if (pattern & kSlot13UV)
-          strength += 5.;
-      break;      
-    case MCalibrationCam::kCT1:
-      strength = 20.;
-      break;      
-    }
-  
-  return strength;
-}
-
-// --------------------------------------------------------------------------
-//
-// return color of continous light
-//
-MRawEvtHeader::CLColor_t MRawEvtHeader::GetContLightColor() const
-{
-  return (CLColor_t)((fTrigPattern[1]>>8)&0xf);
-}
+    return (fTrigPattern[1] >> 16) & 0x1ffff;
+}
+

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -49 +49 @@
       };
     
-    enum PulserColorCode_t 
-      {
-        kSlot1Green     = BIT(0),
-        kSlot2Green     = BIT(1),
-        kSlot3Blue      = BIT(2),
-        kSlot4UV        = BIT(3),
-        kSlot5UV        = BIT(4),
-        kSlot6Blue      = BIT(5),
-        kSlot7Blue      = BIT(6),
-        kSlot8Blue      = BIT(7),
-        kSlot9AttBlue   = BIT(8),
-        kSlot10Blue     = BIT(9),
-        kSlot11Blue     = BIT(10),
-        kSlot12UV       = BIT(11),
-        kSlot13UV       = BIT(12),
-        kSlot14Blue     = BIT(13),
-        kSlot15Green    = BIT(14),
-        kSlot16AttGreen = BIT(15),
-        kCT1Pulser      = BIT(16),
-        kAnyGreen       = kSlot1Green  | kSlot2Green | kSlot15Green | kSlot16AttGreen,
-        kAnyUV          = kSlot4UV     | kSlot5UV    | kSlot12UV    | kSlot13UV,
-        kAnyBlue        = kSlot3Blue   | kSlot6Blue  | kSlot7Blue   | kSlot8Blue 
-                        | kSlot9AttBlue| kSlot10Blue | kSlot11Blue  | kSlot14Blue, 
-        kGreenAndBlue   = kAnyGreen & kAnyBlue,
-        kBlueAndUV      = kAnyBlue  & kAnyUV,
-        kGreenAndUV     = kAnyGreen & kAnyUV,
-        kIFAEPulser     = kAnyGreen | kAnyBlue | kAnyUV,
-        kAny            = kAnyGreen | kAnyBlue | kAnyUV | kCT1Pulser
-      };
 
 private:
@@ -120 +91 @@
     UInt_t     GetTriggerID() const;
     UInt_t     GetCalibrationPattern() const;
+    UInt_t     GetPulserSlotPattern()  const;
 
-    void       SetCalibrationPattern(UInt_t pat) { fTrigPattern[1] = (pat << 16); } // USE THIS FUNCTION WITH EXTREME CARE -- IT IS A WORKAROUND!
-
-    UShort_t   GetPowerOfContLight() const;
-    UInt_t     GetPulserSlotPattern() const;
-    const MCalibrationCam::PulserColor_t GetPulserColor() const;
-    Float_t    GetPulserStrength() const;
-    
-    CLColor_t  GetContLightColor() const;
-    
     Int_t ReadEvt(istream& fin, UShort_t ver);
     void  SkipEvt(istream& fin, UShort_t ver);