Changeset 9274 for trunk/MagicSoft/Mars/msimcamera/MSimCamera.cc

Timestamp:

01/27/09 10:40:55 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msimcamera/MSimCamera.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/msimcamera/MSimCamera.cc

@@ -47 +47 @@
 
 #include "MSpline3.h"
+#include "MPulseShape.h"
 
 #include "MParList.h"
+//#include "MParameters.h"
 
 #include "MPhotonEvent.h"
@@ -67 +69 @@
 //
 MSimCamera::MSimCamera(const char* name, const char *title)
-: fEvt(0), fStat(0), fRunHeader(0), fCamera(0), fSpline(0),
-  fFunction("exp(-(x/2)^2/2)"), fNpx(25), fXmin(-25), fXmax(25)
+: fEvt(0), fStat(0), fRunHeader(0), fCamera(0), fSpline(0)//, fPulsePos(0)
 {
     fName  = name  ? name  : "MSimCamera";
@@ -76 +77 @@
 // --------------------------------------------------------------------------
 //
-//  Call Clear()
-//
-MSimCamera::~MSimCamera()
-{
-    Clear();
-}
-
-// --------------------------------------------------------------------------
-//
-//  Delete fSpline if set and set it to 0
-//
-void MSimCamera::Clear(Option_t *)
-{
-    if (fSpline)
-        delete fSpline;
-    fSpline=0;
-}
-
-// --------------------------------------------------------------------------
-//
-//  Read the intended pulse shape from a file and initialize the spline
-// accordingly
-//
-Bool_t MSimCamera::ReadFile(const char *fname)
-{
-    if (!fRunHeader)
-        return kFALSE;
-
-    if (fname)
-        fFileName = fname;
-
-    *fLog << inf << "Reading pulse shape from " << fFileName << endl;
-
-    const TGraph g(fFileName);
-    if (g.GetN()==0)
-    {
-        *fLog << err << "ERROR - No data points from " << fFileName << "." << endl;
-        return kFALSE;
-    }
-
-    // option: b1/e1 b2/e2   (first second derivative?)
-    // option: valbeg/valend (first second derivative?)
-
-    Clear();
-    fSpline = new MSpline3(g, fRunHeader->GetFreqSampling()/1000.);
-
-    return kTRUE;
-}
-
-void MSimCamera::SetFunction(const TF1 &f)
-{
-    // FIXME: Use TF1 directly? (In most cases this seems to be slower)
-    if (!fRunHeader)
-        return;// kFALSE;
-
-    // option: b1/e1 b2/e2   (first second derivative?)
-    // option: valbeg/valend (first second derivative?)
-
-    // if (f.GetNpar()==0)
-    // No SUPPORT
-
-    Clear();
-    fSpline = new MSpline3(f, fRunHeader->GetFreqSampling()/1000.);
-
-    fFunction = f.GetTitle();
-}
-
-Bool_t MSimCamera::SetFunction(const char *func, Int_t n, Double_t xmin, Double_t xmax)
-{
-    // FIXME: Use TF1 directly? (In most cases this seems to be slower)
-    TF1 f("f", func, xmin, xmax);
-    f.SetNpx(n);
-
-    SetFunction(f);
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// SetReadyToSave for fRunHeader
-//
-Bool_t MSimCamera::ReInit(MParList *pList)
-{
-    // make that the run-header gets written to the file
-    fRunHeader->SetReadyToSave();
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
 // Search for the necessayr parameter containers.
 // Setup spline for pulse shape.
@@ -197 +106 @@
         return kFALSE;
     }
-
-
-    // FIMXE: Move to ReInit in case fRunHeader is read form file?
-    if (!fFileName.IsNull())
-        return ReadFile(fFileName);
-
-    if (!fFunction.IsNull())
-        return SetFunction(fFunction, fNpx, fXmin, fXmax);
-
+/*
+    fPulsePos = (MParameterD*)pList->FindObject("IntendedPulsePos", "MParameterD");
+    if (!fPulsePos)
+    {
+        *fLog << err << "IntendedPulsePos [MParameterD] not found... aborting." << endl;
+        return kFALSE;
+    }
+ */
+    MPulseShape *pulse = (MPulseShape*)pList->FindObject("MPulseShape");
+    if (!pulse)
+    {
+        *fLog << err << "MPulseShape not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    *fLog << warn << "FIXME - SCALE WITH THE SAMPLING FREQUENCY." << endl;
+
+    fSpline = pulse->GetSpline();
     if (!fSpline)
     {
@@ -225 +143 @@
     const Double_t freq = fRunHeader->GetFreqSampling()/1000.;
 
-    const Double_t start = fStat->GetTimeFirst()*freq + fSpline->GetXmin();
-    const Double_t end   = fStat->GetTimeLast() *freq + fSpline->GetXmax();
+    const Double_t start = fStat->GetTimeFirst()*freq;
+    const Double_t end   = fStat->GetTimeLast() *freq;
 
     const UInt_t   nlen  = TMath::CeilNint(end-start);
@@ -236 +154 @@
     const UInt_t npix = fStat->GetMaxIndex()+1;
 
+    const Double_t pl = fSpline->GetXmin()*freq;
+    const Double_t pr = fSpline->GetXmax()*freq;
+
     // Init the arrays and set the range which will contain valid data
     fCamera->Init(npix, nlen);
-    fCamera->SetValidRange(0   -TMath::FloorNint(fSpline->GetXmin()),
-                           nlen-TMath::CeilNint( fSpline->GetXmax()));
+    fCamera->SetValidRange(TMath::FloorNint(pr), TMath::CeilNint(nlen+pl));
 
     // Add electronic noise to empty channels
@@ -258 +178 @@
 
         const UInt_t   idx = ph.GetTag();
-        const Double_t t   = (ph.GetTime()-fStat->GetTimeFirst())*freq - fSpline->GetXmin();
+        const Double_t t   = (ph.GetTime()-fStat->GetTimeFirst())*freq;// - fSpline->GetXmin();
 
         // FIXME: Time jitter?
         // FIXME: Add additional routing here?
 
+        // === FIXME === FIXME === FIXME === Frequency!!!!
         (*fCamera)[idx].AddPulse(*fSpline, t, ph.GetWeight());
     }
 
     return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// FileName: pulse-shape.txt
-// Function.Name: gaus
-// Function.Npx:    50
-// Function.Xmin:  -5
-// Function.Xmax:   5
-//
-Int_t MSimCamera::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
-{
-    Bool_t rc = kFALSE;
-    if (IsEnvDefined(env, prefix, "FileName", print))
-    {
-        rc = kTRUE;
-        SetFileName(GetEnvValue(env, prefix, "FileName", fFileName));
-    }
-
-    if (IsEnvDefined(env, prefix, "Function.Name", print))
-    {
-        rc = kTRUE;
-        SetFunction(GetEnvValue(env, prefix, "Function.Name", fFunction));
-
-        if (IsEnvDefined(env, prefix, "Function.Npx", print))
-            fNpx = GetEnvValue(env, prefix, "Function.Npx", fNpx);
-        if (IsEnvDefined(env, prefix, "Function.Xmin", print))
-            fXmin = GetEnvValue(env, prefix, "Function.Xmin", fXmin);
-        if (IsEnvDefined(env, prefix, "Function.Xmax", print))
-            fXmax = GetEnvValue(env, prefix, "Function.Xmax", fXmax);
-    }
-
-    return rc;
 }