Changeset 7058

Timestamp:

05/18/05 18:38:53 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MContinue.cc (modified) (2 diffs)
• mcalib/MCalibrationChargeCalc.cc (modified) (2 diffs)
• msignal/MExtractPINDiode.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -54 +54 @@
        more by calculating the number of steps from the rise and fall time.
        this should at least give consistent results on the same machine!
+
+   * mbase/MContinue.cc:
+     - fixed a namimg problem of the filter when it is added to
+       the tasklist and has the same name as MContinue
+
+   * mcalib/MCalibrationChargeCalc.cc:
+     - for some sceen output the manipulator (inf) was missing
+
+   * msignal/MExtractPINDiode.cc:
+     - fixed a problem with the fit (it always tried to display
+       the fit-function somewhere)
 
 

trunk/MagicSoft/Mars/mbase/MContinue.cc

@@ -148 +148 @@
     }
 
+    if ((TString)GetFilter()->GetName()==fName)
+        GetFilter()->SetName(Form("MF:%s", fName.Data()));
+
     if (!fTaskList->AddToListBefore(GetFilter(), this))
     {
@@ -295 +298 @@
     MTask::SetFilter(f);
 
-    f->SetName(Form("MF:%s", fName.Data()));
-
     return kTRUE;
 }

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -501 +501 @@
       fBlindCam = (MCalibrationBlindCam*)pList->FindObject(AddSerialNumber("MCalibrationBlindCam"));
       if (!fBlindCam)
-        *fLog << "No MCalibrationBlindCam found... no Blind Pixel method!" << endl;
+        *fLog << inf << "No MCalibrationBlindCam found... no Blind Pixel method!" << endl;
     }
   
   fHBlindCam = (MHCalibrationChargeBlindCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeBlindCam"));  
   if (!fHBlindCam)
-    *fLog << "No MHCalibrationChargeBlindCam found... no Blind Pixel method!" << endl;
+    *fLog << inf << "No MHCalibrationChargeBlindCam found... no Blind Pixel method!" << endl;
 
   fIntensBad = (MBadPixelsIntensityCam*)pList->FindObject(AddSerialNumber("MBadPixelsIntensityCam"));
@@ -526 +526 @@
   fPINDiode = (MCalibrationChargePINDiode*)pList->FindObject("MCalibrationChargePINDiode");
   if (!fPINDiode)
-    *fLog << "No MCalibrationChargePINDiode found... no PIN Diode method!" << endl;
+    *fLog << inf << "No MCalibrationChargePINDiode found... no PIN Diode method!" << endl;
   
   MCalibrationQECam     *qecam     = fIntensQE      

trunk/MagicSoft/Mars/msignal/MExtractPINDiode.cc

@@ -354 +354 @@
     }
 
-  fSlices->Fit("gaus", "RQ", "", maxpos-fLowerFitLimit,maxpos+fUpperFitLimit);
-  
-  TF1 *gausfunc = fSlices->GetFunction("gaus");
-
-  fPINDiode->SetExtractedSignal(gausfunc->GetParameter(0), gausfunc->GetParError(0));
-  fPINDiode->SetExtractedTime  (gausfunc->GetParameter(1), gausfunc->GetParError(1));
-  fPINDiode->SetExtractedSigma (gausfunc->GetParameter(2), gausfunc->GetParError(2));
-  fPINDiode->SetExtractedChi2  (gausfunc->GetChisquare());
+  // Must be created manually. Otherwise we cannot use N-option
+  TF1 gaus("func", "gaus");
+
+  fSlices->Fit(&gaus, "QN", "", maxpos-fLowerFitLimit,maxpos+fUpperFitLimit);
+  
+  fPINDiode->SetExtractedSignal(gaus.GetParameter(0), gaus.GetParError(0));
+  fPINDiode->SetExtractedTime  (gaus.GetParameter(1), gaus.GetParError(1));
+  fPINDiode->SetExtractedSigma (gaus.GetParameter(2), gaus.GetParError(2));
+  fPINDiode->SetExtractedChi2  (gaus.GetChisquare());
   fPINDiode->SetReadyToSave();