Changeset 4958 for trunk/MagicSoft/Mars/mtools

Timestamp:

09/12/04 21:13:24 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtools

Files:

• MFFT.cc (modified) (11 diffs)
• MFFT.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mtools/MFFT.cc

@@ -103 +103 @@
 #include "MLogManip.h"
 
+#include "MArrayD.h"
+#include "MArrayF.h"
+#include "MArrayI.h"
+
 ClassImp(MFFT);
 
@@ -628 +632 @@
 }
 
-
+//----------------------------------------------------------
 //
 // Power Spectrum Density Calculation
@@ -678 +682 @@
 }
 
+// -------------------------------------------------
 //
 // Power Spectrum Density calculation for TArrayF
@@ -710 +715 @@
   //
   c02 = (fDataF[0]*fDataF[0]);
-  //  newarray->AddAt(c02/dim2,0);
+  newarray->AddAt(c02/dim2,0);
   //
   // 2) P(k) = 1/(N*N) (|C(k)|*|C(k)|))
@@ -724 +729 @@
   //
   cn2 = (fDataF[1]*fDataF[1]);
-  //  newarray->AddAt(cn2,dim05-1);
+  newarray->AddAt(cn2,dim05-1);
   
   return newarray;
 }
 
-
+// -------------------------------------------------
 //
 // Power Spectrum Density calculation for TArrayI
@@ -762 +767 @@
   //
   c02 = (fDataF[0]*fDataF[0]);
-  //  newarray->AddAt(c02/dim2,0);
+  newarray->AddAt(c02/dim2,0);
   //
   // 2) P(k) = 1/(N*N) (|C(k)|*|C(k)|))
@@ -776 +781 @@
   //
   cn2 = (fDataF[1]*fDataF[1]);
-  //  newarray->AddAt(cn2,dim05-1);
+  newarray->AddAt(cn2,dim05-1);
   
   return newarray;
@@ -782 +787 @@
 
 
+// -------------------------------------------------
+//
+// Power Spectrum Density calculation for TArrayD
+//
 TArrayD* MFFT::PowerSpectrumDensity(const TArrayD *array)
 {
@@ -811 +820 @@
   //
   c02 = (fDataD[0]*fDataD[0]);
-  //  newarray->AddAt(c02/dim2,0);
+  newarray->AddAt(c02/dim2,0);
   //
   // 2) P(k) = 1/(N*N) (|C(k)|*|C(k)|))
@@ -825 +834 @@
   //
   cn2 = (fDataD[1]*fDataD[1]);
+  newarray->AddAt(cn2,dim05-1);
+  
+  return newarray;
+}
+
+// -------------------------------------------------
+//
+// Power Spectrum Density calculation for MArrayF
+// The difference to the TArrayF versions is that 
+// the resulting array has two entries less, namely 
+// the first and last one are skipped!
+//
+MArrayF* MFFT::PowerSpectrumDensity(const MArrayF *array)
+{
+
+  fDim = array->GetSize();
+  CheckDim(fDim);
+
+  fDataF.Set(fDim);
+  //
+  // Copy the hist into an array
+  //
+  for (Int_t i=0;i<fDim;i++)
+    fDataF[i] = array->At(i);
+
+  RealFTF(1);
+
+  const Int_t dim2  = fDim*fDim;
+  const Int_t dim05 = fDim/2;
+  Float_t ck2;
+  
+  MArrayF *newarray = new MArrayF(dim05-2);
+
+  //
+  // Fill the new histogram: 
+  //
+  // 1) P(0) = 1/(N*N) |C(0)|*|C(0)|
+  //
+  //  c02 = (fDataF[0]*fDataF[0]);
+  //  newarray->AddAt(c02/dim2,0);
+  //
+  // 2) P(k) = 1/(N*N) (|C(k)|*|C(k)|))
+  //
+  for (Int_t k=1;k<dim05-1;k++)
+    {
+      const Int_t k2 = k+k;
+      ck2 = (fDataF[k2]*fDataF[k2] + fDataF[k2+1]*fDataF[k2+1]);
+      newarray->AddAt(ck2/dim2,k-1);
+    }
+  //
+  // 3) P(N) = 1/(N*N) (|C(n/2)|*|C(n/2)|)
+  //
+  //  cn2 = (fDataF[1]*fDataF[1]);
   //  newarray->AddAt(cn2,dim05-1);
   
@@ -830 +892 @@
 }
 
-
+//-----------------------------------------------------
+//
+// Power Spectrum Density calculation for MArrayI
+// The difference to the TArrayI versions is that 
+// the resulting array has two entries less, namely 
+// the first and last one are skipped!
+//
+MArrayF* MFFT::PowerSpectrumDensity(const MArrayI *array)
+{
+
+  fDim = array->GetSize();
+  CheckDim(fDim);
+
+  fDataF.Set(fDim);
+  //
+  // Copy the hist into an array
+  //
+  for (Int_t i=0;i<fDim;i++)
+    fDataF[i] = (Float_t)array->At(i);
+
+  RealFTF(1);
+
+  const Int_t dim2  = fDim*fDim;
+  const Int_t dim05 = fDim/2;
+  Float_t ck2;
+  
+  MArrayF *newarray = new MArrayF(dim05-2);
+
+  //
+  // Fill the new histogram: 
+  //
+  // 1) P(0) = 1/(N*N) |C(0)|*|C(0)|
+  //
+  //  c02 = (fDataF[0]*fDataF[0]);
+  //  newarray->AddAt(c02/dim2,0);
+  //
+  // 2) P(k) = 1/(N*N) (|C(k)|*|C(k)|))
+  //
+  for (Int_t k=1;k<dim05-1;k++)
+    {
+      const Int_t k2 = k+k;
+      ck2 = (fDataF[k2]*fDataF[k2] + fDataF[k2+1]*fDataF[k2+1]);
+      newarray->AddAt(ck2/dim2,k-1);
+    }
+  //
+  // 3) P(N) = 1/(N*N) (|C(n/2)|*|C(n/2)|)
+  //
+  //  cn2 = (fDataF[1]*fDataF[1]);
+  //  newarray->AddAt(cn2,dim05-1);
+  
+  return newarray;
+}
+
+// -------------------------------------------------
+//
+// Power Spectrum Density calculation for MArrayD
+// The difference to the TArrayI versions is that 
+// the resulting array has two entries less, namely 
+// the first and last one are skipped!
+//
+MArrayD* MFFT::PowerSpectrumDensity(const MArrayD *array)
+{
+  
+  fDim = array->GetSize();
+  CheckDim(fDim);
+
+  fDataD.Set(fDim);
+  //
+  // Copy the hist into an array
+  //
+  for (Int_t i=0;i<fDim;i++)
+    fDataD[i] = array->At(i);
+
+  RealFTD(1);
+
+  const Int_t dim2  = fDim*fDim;
+  const Int_t dim05 = fDim/2;
+  Float_t ck2;
+  
+  MArrayD *newarray = new MArrayD(dim05-2);
+
+  //
+  // Fill the new histogram: 
+  //
+  // 1) P(0) = 1/(N*N) |C(0)|*|C(0)|
+  //
+  //  c02 = (fDataD[0]*fDataD[0]);
+  //  newarray->AddAt(c02/dim2,0);
+  //
+  // 2) P(k) = 1/(N*N) (|C(k)|*|C(k)|))
+  //
+  for (Int_t k=1;k<dim05-1;k++)
+    {
+      const Int_t k2 = k+k;
+      ck2 = (fDataD[k2]*fDataD[k2] + fDataD[k2+1]*fDataD[k2+1]);
+      newarray->AddAt(ck2/dim2,k-1);
+    }
+  //
+  // 3) P(N) = 1/(N*N) (|C(n/2)|*|C(n/2)|)
+  //
+  //  cn2 = (fDataD[1]*fDataD[1]);
+  //  newarray->AddAt(cn2,dim05-1);
+  
+  return newarray;
+}
+
+// -----------------------------------------------
 //
 // Power Spectrum Density calculation for TH1

trunk/MagicSoft/Mars/mtools/MFFT.h

@@ -22 +22 @@
 #endif
 
+class MArrayI;
+class MArrayD;
+class MArrayF;
 class MFFT : public TObject
 {
@@ -78 +81 @@
   TArrayD* PowerSpectrumDensity(const TArrayD *array);
 
+  MArrayF* PowerSpectrumDensity(const MArrayI *array);  
+  MArrayF* PowerSpectrumDensity(const MArrayF *array);
+  MArrayD* PowerSpectrumDensity(const MArrayD *array);
+
   TArrayF*  RealFunctionSpectrum(const TArrayF *data);