Changeset 746 in Sophya for trunk/SophyaLib/Samba/sphericaltransformserver.cc

Timestamp:

Mar 1, 2000, 5:46:20 PM (26 years ago)

Author:

ansari

Message:

ajustement de type double r_8 etc.

File:

• trunk/SophyaLib/Samba/sphericaltransformserver.cc (modified) (15 diffs)

trunk/SophyaLib/Samba/sphericaltransformserver.cc

@@ -63 +63 @@
 
   // pour chaque tranche en theta
-  for (int ith = 0; ith < map.NbThetaSlices();ith++)
+  for (int_4 ith = 0; ith < map.NbThetaSlices();ith++)
     {
       int_4 nph;
@@ -195 +195 @@
   //sortie.ReSize(nph);
   TVector< complex<T> > sortie(nph);
-  //  sortie.SetTemp(true);
+  sortie.SetTemp(true);
 
   fftIntfPtr_-> FFTBackward(data, sortie);
@@ -274 +274 @@
   //sortie.ReSize(nph);
   TVector<T> sortie;
-  //  sortie.SetTemp(true);
+  sortie.SetTemp(true);
 
   fftIntfPtr_-> FFTBackward(data, sortie);
@@ -295 +295 @@
   TVector< complex<T> > phase(nmmax+1);
   Alm<T> alm;
-  //  alm.SetTemp(true);
+  alm.SetTemp(true);
   alm.ReSizeToLmax(nlmax);
-  //  cout << " nombre de tranches " << map.NbThetaSlices() << endl;
-  for (int ith = 0; ith < map.NbThetaSlices(); ith++)
+  for (int_4 ith = 0; ith < map.NbThetaSlices(); ith++)
     {
       int_4 nph;
@@ -320 +319 @@
           // for(int kk=0; kk<nph; kk++) datain(kk)=complex<T>(data(kk),(T)0.);
 
-          //  phase = CFromFourierAnalysis(nlmax,nmmax,datain,phi0);
-          phase = CFromFourierAnalysis(nlmax,nmmax,data,phi0);
+          //  phase = CFromFourierAnalysis(nmmax,datain,phi0);
+          phase = CFromFourierAnalysis(nmmax,data,phi0);
 
         }
@@ -345 +344 @@
 }
 template<class T>
-TVector< complex<T> > SphericalTransformServer<T>::CFromFourierAnalysis(int_4 nlmax,int_4 nmmax, const TVector<complex<T> >datain, r_8 phi0) const
+TVector< complex<T> > SphericalTransformServer<T>::CFromFourierAnalysis(int_4 nmmax, const TVector<complex<T> >datain, r_8 phi0) const
 {
   /*=======================================================================
@@ -382 +381 @@
 //&&&&&&&&& nouvelle version
 template<class T>
-TVector< complex<T> > SphericalTransformServer<T>::CFromFourierAnalysis(int_4 nlmax,int_4 nmmax, const TVector<T> datain, r_8 phi0) const
+TVector< complex<T> > SphericalTransformServer<T>::CFromFourierAnalysis(int_4 nmmax, const TVector<T> datain, r_8 phi0) const
 {
   //=======================================================================
@@ -549 +548 @@
       throw SzMismatchError("SphericalTransformServer::DecomposeToAlm: map Q and map U have not same size ");
     }
-  for (int ith = 0; ith < mapq.NbThetaSlices(); ith++)
+  for (int_4 ith = 0; ith < mapq.NbThetaSlices(); ith++)
     {
       int_4 nph;
@@ -568 +567 @@
         {
           //  almFromPM(nph, nlmax, nmmax, phi0, domega, theta, dataq, datau, alme, almb); 
-          almFromWX(nph, nlmax, nmmax, phi0, domega, theta, dataq, datau, alme, almb); 
-        }
-    }
-}
-
-
-template<class T>
-void SphericalTransformServer<T>::almFromWX(int_4 nph, int_4 nlmax, int_4 nmmax,
+          almFromWX(nlmax, nmmax, phi0, domega, theta, dataq, datau, alme, almb); 
+        }
+    }
+}
+
+
+template<class T>
+void SphericalTransformServer<T>::almFromWX(int_4 nlmax, int_4 nmmax,
                                          r_8 phi0, r_8 domega, 
                                          r_8 theta, 
@@ -593 +592 @@
   //  for(int kk=0; kk<nph; kk++) datain(kk)=complex<T>(dataq(kk),0.);
 
-  // phaseq = CFromFourierAnalysis(nlmax,nmmax,datain,phi0); 
-  phaseq = CFromFourierAnalysis(nlmax,nmmax,dataq,phi0); 
+  // phaseq = CFromFourierAnalysis(nmmax,datain,phi0); 
+  phaseq = CFromFourierAnalysis(nmmax,dataq,phi0); 
 
   // for(int kk=0; kk<nph; kk++) datain(kk)=complex<T>(datau(kk),0.);
 
   // phaseu=  CFromFourierAnalysis(nlmax,nmmax,datain,phi0); 
-  phaseu=  CFromFourierAnalysis(nlmax,nmmax,datau,phi0); 
+  phaseu=  CFromFourierAnalysis(nmmax,datau,phi0); 
 
   LambdaWXBuilder lwxb(theta,nlmax,nmmax);
@@ -644 +643 @@
   for(int kk=0; kk<nph; kk++) datain(kk)=complex<T>(dataq(kk),datau(kk));
 
-  phasep = CFromFourierAnalysis(nlmax,nmmax,datain,phi0); 
+  phasep = CFromFourierAnalysis(nmmax,datain,phi0); 
 
   for(int kk=0; kk<nph; kk++) datain(kk)=complex<T>(dataq(kk),-datau(kk));
-  phasem = CFromFourierAnalysis(nlmax,nmmax,datain,phi0); 
+  phasem = CFromFourierAnalysis(nmmax,datain,phi0); 
   LambdaPMBuilder lpmb(theta,nlmax,nmmax);
           
@@ -679 +678 @@
   Bm<complex<T> > b_m_theta_u(nmmax);
 
-  for (int ith = 0; ith < mapq.NbThetaSlices();ith++)
+  for (int_4 ith = 0; ith < mapq.NbThetaSlices();ith++)
     {
       int_4 nph;
@@ -748 +747 @@
   Bm<complex<T> > b_m_theta_p(nmmax);
   Bm<complex<T> > b_m_theta_m(nmmax);
-  for (int ith = 0; ith < mapq.NbThetaSlices();ith++)
+  for (int_4 ith = 0; ith < mapq.NbThetaSlices();ith++)
     {
       int_4 nph;
@@ -834 +833 @@
 {
 
-  //  Alm<T> alm;
-  //  almFromCl(alm, Cl, fwhm); 
-  //Alm<T> alm = almFromCl(Cl, fwhm);
   Alm<T> alm(Cl, fwhm);
   GenerateFromAlm(sph,pixelSizeIndex, alm ); 
@@ -846 +842 @@
 TVector<T>  SphericalTransformServer<T>::DecomposeToCl(const SphericalMap<T>& sph, int_4 nlmax, r_8 cos_theta_cut) const
 {
-  //  Alm<T> alm;
-  //  DecomposeToAlm( sph, alm,nlmax, cos_theta_cut);
     Alm<T> alm=DecomposeToAlm( sph, nlmax, cos_theta_cut);
   // power spectrum