Changeset 9425 for trunk/MagicSoft/Mars/msim

Timestamp:

04/16/09 12:04:29 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msim

Files:

• MSimAbsorption.cc (modified) (7 diffs)
• MSimAbsorption.h (modified) (3 diffs)

trunk/MagicSoft/Mars/msim/MSimAbsorption.cc

@@ -30 +30 @@
 //
 //  Input Containers:
+//   fParName [MParSpline]
 //   MPhotonEvent
 //   MCorsikaEvtHeader
@@ -43 +44 @@
 
 #include <TRandom.h>
-#include <TSpline.h>
 
 #include "MLog.h"
@@ -50 +50 @@
 #include "MParList.h"
 
-#include "MBinning.h"
-#include "MArrayD.h"
-
-#include "MSpline3.h"
+#include "MParSpline.h"
 
 #include "MCorsikaEvtHeader.h"
@@ -69 +66 @@
 //
 MSimAbsorption::MSimAbsorption(const char* name, const char *title)
-    : fEvt(0), fHeader(0), fSpline(0), fUseTheta(kFALSE)
+    : fEvt(0), fHeader(0), fSpline(0), fParName("MParSpline"), fUseTheta(kFALSE)
 {
     fName  = name  ? name  : "MSimAbsorption";
     fTitle = title ? title : "Task to calculate wavelength dependent absorption";
-}
-
-// --------------------------------------------------------------------------
-//
-//  Calls Clear()
-//
-MSimAbsorption::~MSimAbsorption()
-{
-    Clear();
-}
-
-// --------------------------------------------------------------------------
-//
-// Delete fSpline and set to 0.
-//
-void MSimAbsorption::Clear(Option_t *)
-{
-    if (fSpline)
-        delete fSpline;
-    fSpline=0;
-}
-
-// --------------------------------------------------------------------------
-//
-// Read a TGraph from a file and return a newly allocated MSpline3.
-//
-MSpline3 *MSimAbsorption::ReadSpline(const char *fname)
-{
-    *fLog << inf << "Reading spline from " << fname << endl;
-
-    TGraph g(fname);
-    if (g.GetN()==0)
-    {
-        *fLog << err << "ERROR - No data points from " << fname << "." << endl;
-        return 0;
-    }
-
-    // option: b1/e1 b2/e2   (first second derivative?)
-    // option: valbeg/valend (first second derivative?)
-
-    return new MSpline3(g);
-}
-
-// --------------------------------------------------------------------------
-//
-// Initializes a spline from min to max with n points with 1.
-//
-void MSimAbsorption::InitUnity(UInt_t n, Float_t min, Float_t max)
-{
-    // Delete the existing spline
-    Clear();
-
-    // We need at least two points (the edges)
-    if (n<2)
-        return;
-
-    // Initialize an array with the x-values
-    const MBinning bins(n-1, min, max);
-
-    // Initialize an array with all one
-    MArrayD y(n);
-    y.Reset(1);
-
-    // Set the spline
-    fSpline = new MSpline3(bins.GetEdges(), y.GetArray(), n);
-}
-
-// --------------------------------------------------------------------------
-//
-// Takes the existing fSpline and multiplies it with the given spline.
-// As x-points the values from fSpline are used.
-//
-void MSimAbsorption::Multiply(const TSpline3 &spline)
-{
-    if (!fSpline)
-    {
-        Clear();
-        // WARNING WARNING WARNING: This is a very dangerous cast!
-        fSpline = (MSpline3*)spline.Clone();
-        return;
-    }
-
-    // Initialize a TGraph with the number of knots from a TSpline
-    TGraph g(fSpline->GetNp());
-
-    // Loop over all knots
-    for (int i=0; i<fSpline->GetNp(); i++)
-    {
-        // Get th i-th knot
-        Double_t x, y;
-        fSpline->GetKnot(i, x, y);
-
-        // Multiply y by the value from the given spline
-        y *= spline.Eval(x);
-
-        // push the point "back"
-        g.SetPoint(i, x, y);
-    }
-
-    // Clear the spline and initialize a new one from the updated TGraph
-    Clear();
-    fSpline = new MSpline3(g);
-}
-
-// --------------------------------------------------------------------------
-//
-// Initializes a TSpline3 with n knots x and y. Call Multiply for it.
-//
-void MSimAbsorption::Multiply(UInt_t n, const Double_t *x, const Double_t *y)
-{
-    const TSpline3 spline("Spline", const_cast<Double_t*>(x), const_cast<Double_t*>(y), n);
-    Multiply(spline);
-}
-
-// --------------------------------------------------------------------------
-//
-// Read a Spline from a file using ReadSpline.
-// Call Multiply for it.
-//
-void MSimAbsorption::Multiply(const char *fname)
-{
-    const MSpline3 *spline = ReadSpline(fname);
-    if (!spline)
-        return;
-
-    fFileName = "";
-
-    Multiply(*spline);
-
-    delete spline;
-}
-
-// --------------------------------------------------------------------------
-//
-// Read a spline from a file and set fSpline accfordingly.
-//
-Bool_t MSimAbsorption::ReadFile(const char *fname)
-{
-    if (fname)
-        fFileName = fname;
-
-    MSpline3 *spline = ReadSpline(fFileName);
-    if (!spline)
-        return kFALSE;
-
-
-    // option: b1/e1 b2/e2   (first second derivative?)
-    // option: valbeg/valend (first second derivative?)
-
-    Clear();
-    fSpline = spline;
-
-    return kTRUE;
 }
 
@@ -235 +79 @@
 Int_t MSimAbsorption::PreProcess(MParList *pList)
 {
-    if (fFileName.IsNull())
-    {
-        *fLog << inf << "No file given... skipping." << endl;
-        return kSKIP;
-    }
-
     fEvt = (MPhotonEvent*)pList->FindObject("MPhotonEvent");
     if (!fEvt)
     {
         *fLog << err << "MPhotonEvent not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fSpline = (MParSpline*)pList->FindObject(fParName, "MParSpline");
+    if (!fSpline)
+    {
+        *fLog << err << fParName << " [MParSpline] not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    if (!fSpline->IsValid())
+    {
+        *fLog << err << "Spline in " << fParName << " is inavlid... aborting." << endl;
         return kFALSE;
     }
@@ -257 +108 @@
     *fLog << inf << "Using " << (fUseTheta?"Theta":"Wavelength") << " for absorption." << endl;
 
-    return ReadFile();
+    return kTRUE;
 }
 
@@ -331 +182 @@
 {
     Bool_t rc = kFALSE;
-    if (IsEnvDefined(env, prefix, "FileName", print))
+    if (IsEnvDefined(env, prefix, "ParName", print))
     {
         rc = kTRUE;
-        SetFileName(GetEnvValue(env, prefix, "FileName", fFileName));
+        SetParName(GetEnvValue(env, prefix, "ParName", fParName));
     }
 

trunk/MagicSoft/Mars/msim/MSimAbsorption.h

@@ -6 +6 @@
 #endif
 
-class TSpline3;
-
 class MParList;
-class MSpline3;
+class MParSpline;
 class MPhotonEvent;
 class MCorsikaEvtHeader;
@@ -19 +17 @@
     MCorsikaEvtHeader *fHeader;  //! Header storing event information
 
-    MSpline3          *fSpline;  //! Spline to interpolate wavelength or incident angle
+    MParSpline        *fSpline;  //! Spline to interpolate wavelength or incident angle
 
-    TString fFileName;           // FileName of the file containing the curve
+    TString fParName;            // Container name of the spline containing the curve
     Bool_t  fUseTheta;           // Switches between using wavelength or incident angle
 
@@ -32 +30 @@
     Int_t  Process();
 
-    // MSimAbsorption
-    MSpline3 *ReadSpline(const char *fname);
-
 public:
     MSimAbsorption(const char *name=NULL, const char *title=NULL);
-    ~MSimAbsorption();
 
     // MSimAbsorption
-    Bool_t ReadFile(const char *fname=0);
-    void SetFileName(const char *fname) { fFileName=fname; }
+    void SetParName(const char *name) { fParName=name; }
 
     void SetUseTheta(Bool_t b=kTRUE) { fUseTheta = b; }
-
-    void InitUnity(UInt_t n, Float_t min, Float_t max);
-
-    void Multiply(const char *fname);
-    void Multiply(const TSpline3 &spline);
-    void Multiply(UInt_t n, const Double_t *x, const Double_t *y);
-
-    // TObject
-    void Clear(Option_t *o="");
 
     ClassDef(MSimAbsorption, 0) // Task to calculate wavelength or incident angle dependent absorption