Merge branch 'master' of gitlab.in2p3.fr:xQML/xQML

i
/bin/bash: q: command not found

src/libcov.c

@@ -6,14 +6,16 @@ void build_dSdC( int nside, int nstokes, int npix, int nbin, long *ellbins, long
   const int lmax1 = lmax+1;
   const int ns=3, nspecall = 4;
   const int nspec = nstokes2nspec(nstokes);
-  const int npixtot = npix*nstokes;
+  const int64_t npixtot = npix*nstokes;
 
 //   fprintf( stdout, "lmax=%d\n", lmax);
 //   fprintf( stdout, "npix=%d\n", npix);
 //   fprintf( stdout, "nstokes=%d\n", nstokes);
 //   fprintf( stdout, "nspec=%d\n", nspec);
 
-  memset( dSdC, 0., (nspec*nbin*nstokes*npix*nstokes*npix) * sizeof(double));
+  int64_t ntot = nspec*nbin*npixtot*npixtot;
+//   fprintf( stdout, "memset (%d,%d,%d,%d = %lld)...\n", nspec,nbin,nstokes,npix,ntot);
+  memset( dSdC, 0., ntot * sizeof(double));
 
 #pragma omp parallel default(none) shared(stdout,nbin,nside,npix,nstokes,dSdC,ipix,bl,ellbins)
   {

xqml/estimators.py

@@ -146,7 +146,7 @@ def El(invCAA, invCBB, Pl):
 
 def CrossWindowFunction(El, Pl):
     """
-    Compute mode-mixign matrix (Tegmark's window matrix)
+    Compute mode-mixing matrix (Tegmark's window matrix)
     Wll = Trace[invCAA.Pl.invCBB.Pl] = Trace[El.Pl]
 
     Parameters
@@ -181,7 +181,7 @@ def CrossWindowFunction(El, Pl):
 
 def CrossWindowFunctionLong(invCAA, invCBB, Pl):
     """
-    Compute mode-mixign matrix (Tegmark's window matrix)
+    Compute mode-mixing matrix (Tegmark's window matrix)
     Wll = Trace[invCAA.Pl.invCBB.Pl] = Trace[El.Pl]
 
     Parameters
@@ -437,4 +437,4 @@ if __name__ == "__main__":
     import doctest
     if np.__version__ >= "1.14.0":
         np.set_printoptions(legacy="1.13")
-    doctest.testmod()
+    doctest.testmod()
\ No newline at end of file