Changeset 4339 for trunk/MagicSoft

Timestamp:

06/23/04 01:48:35 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mcalib/MHCalibrationChargeCam.cc (modified) (8 diffs)
• msignal/MExtractor.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -156 +156 @@
 const Float_t MHCalibrationChargeCam::fgTimeLowerLimit           = 1.;
 const Float_t MHCalibrationChargeCam::fgTimeUpperLimit           = 2.;
-const Int_t   MHCalibrationChargeCam::gkNumRefColours            = 6;
+const Int_t   MHCalibrationChargeCam::gkNumRefColours            = 7;
 // --------------------------------------------------------------------------
 //
@@ -186 +186 @@
   gkLoGainOuterRefLines.Set(gkNumRefColours);
 
+  // 1 LED green
   gkHiGainInnerRefLines.AddAt(245. ,0);
   gkHiGainOuterRefLines.AddAt(217. ,0);
@@ -191 +192 @@
   gkLoGainOuterRefLines.AddAt(18.9 ,0);
 
+  // 1 LED blue
   gkHiGainInnerRefLines.AddAt(323. ,1);
   gkHiGainOuterRefLines.AddAt(307.5,1);
@@ -196 +198 @@
   gkLoGainOuterRefLines.AddAt(26.0 ,1);
 
+  // 5 LEDs blue
   gkHiGainInnerRefLines.AddAt(1065.,2);
   gkHiGainOuterRefLines.AddAt(932. ,2);
@@ -201 +204 @@
   gkLoGainOuterRefLines.AddAt(108.3,2);
 
+  // 10 LEDs blue
   gkHiGainInnerRefLines.AddAt(1467.,3);
   gkHiGainOuterRefLines.AddAt(1405.,3);
@@ -206 +210 @@
   gkLoGainOuterRefLines.AddAt(198. ,3);
 
+  // 10 LEDs UV
   gkHiGainInnerRefLines.AddAt(180.,4);
   gkHiGainOuterRefLines.AddAt(167.,4);
@@ -211 +216 @@
   gkLoGainOuterRefLines.AddAt(14.0,4);
 
+  // CT1
   gkHiGainInnerRefLines.AddAt(211.,5);
   gkHiGainOuterRefLines.AddAt(183.5,5);
   gkLoGainInnerRefLines.AddAt(13.5,5);
   gkLoGainOuterRefLines.AddAt(11.,5);
+
+  // 5 LEDs green
+  gkHiGainInnerRefLines.AddAt(533.5,6);
+  gkHiGainOuterRefLines.AddAt(405.5,6);
+  gkLoGainInnerRefLines.AddAt(41.7,6);
+  gkLoGainOuterRefLines.AddAt(42.,6);
+
 }
 
@@ -1047 +1060 @@
   green1->Draw();
 
+  TLine *green5 = new TLine(refline.At(6),0.,refline.At(6),hist->GetYaxis()->GetXmax());
+  green5->SetBit(kCanDelete);
+  green5->SetLineColor(8);
+  green5->SetLineStyle(2);
+  green5->SetLineWidth(3);
+  green5->Draw();
+
   TLine *blue1   = new TLine(refline.At(1),0.,refline.At(1),hist->GetYaxis()->GetXmax());
   blue1->SetBit(kCanDelete);

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -47 +47 @@
     Byte_t  fSaturationLimit;
 
-    virtual void FindSignalHiGain(Byte_t *firstused, Byte_t *lowgain, Int_t &sum, Byte_t &sat) const;
-    virtual void FindSignalLoGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const;
+    virtual void FindSignalHiGain(Byte_t *firstused, Byte_t *lowgain, Float_t &sum, Byte_t &sat) const;
+    virtual void FindSignalLoGain(Byte_t *firstused, Float_t &sum, Byte_t &sat) const;
 
     virtual Int_t  PreProcess(MParList *pList);