Changeset 9261 for trunk/MagicSoft/Mars/msignal

Timestamp:

01/25/09 14:32:11 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MSignalCalc.cc (modified) (3 diffs)
• MSignalCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MSignalCalc.cc

@@ -127 +127 @@
 Int_t MSignalCalc::Process()
 {
+    if (!fPedestals)
+        return kFALSE;
+
     const Int_t npix = fRawEvt->GetNumPixels();
     const Int_t nhi  = fRunHeader->GetNumSamplesHiGain();
@@ -259 +262 @@
         // Preliminary: Do not overwrite pedestals calculated by
         // MMcPedestalCopy and MMcPedestalNSBAdd
-        if (fPedestals)
-            (*fPedestals)[i].Set(b/fRunHeader->GetScale(), sigb/fRunHeader->GetScale());
+        (*fPedestals)[i].Set(b/fRunHeader->GetScale(), sigb/fRunHeader->GetScale());
     }
 
@@ -266 +268 @@
     //fCerPhotEvt->SetReadyToSave();
 
-    if (fPedestals)
-        fPedestals->SetReadyToSave();
+    fPedestals->SetReadyToSave();
 
     return kTRUE;

trunk/MagicSoft/Mars/msignal/MSignalCam.cc

@@ -570 +570 @@
 //  7: arrival time if signa avove 20phe
 //  8: arrival time
-// 10: arrival time if extracted from lo-gain
-// 11: arrival time if extracted from hi-gain (and signal above 20phe)
+// 10: as 0, but returns kFALSE if signal <=0
+// 11: as 8, but returns kFALSE if signal <=0
 //
 Bool_t MSignalCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
@@ -648 +648 @@
         */
 
+    case 10:
+        val = pix.GetNumPhotons()*ratio;
+        return val>0;
+
+    case 11:
+        val = pix.GetArrivalTime();
+        return pix.GetNumPhotons()>0;
+
     case 9:
     default: