Fi proy substraction fixes

src/xmipp/libraries/parallel/mpi_subtract_projection.cpp

@@ -1,6 +1,7 @@
 /***************************************************************************
  *
- * Authors:  Estrella Fernandez Gimenez ([email protected])
+ * Authors:     Estrella Fernandez Gimenez ([email protected])
+ * 				Federico P. de Isidro-Gomez ([email protected])
  *
  * Unidad de  Bioinformatica of Centro Nacional de Biotecnologia , CSIC
  *
@@ -48,46 +49,38 @@ void MpiProgSubtractProjection::preProcess()
     int origin;
     int realSizeMask;
     int originMask;
-    if (node->rank == 0)
-    {
-        realSize = (int)XSIZE(projector->VfourierRealCoefs);
-        origin = STARTINGX(projector->VfourierRealCoefs);
-        realSizeMask = (int)XSIZE(projectorMask->VfourierRealCoefs);
-        originMask = STARTINGX(projectorMask->VfourierRealCoefs);
-    }
 
-    MPI_Bcast(&realSize, 1, MPI_INT, 0, MPI_COMM_WORLD);
-    MPI_Bcast(&origin, 1, MPI_INT, 0, MPI_COMM_WORLD);
-    MPI_Bcast(&(projector->volumePaddedSize), 1, MPI_INT, 0, MPI_COMM_WORLD); 
-    MPI_Bcast(&projector->volumeSize, 1, MPI_INT, 0, MPI_COMM_WORLD);
+    if (!realSpaceProjector)
+    {
+        if (node->rank == 0)
+        {
+            realSize = (int)XSIZE(projector->VfourierRealCoefs);
+            origin = STARTINGX(projector->VfourierRealCoefs);
+        }
 
-    MPI_Bcast(&realSizeMask, 1, MPI_INT, 0, MPI_COMM_WORLD);
-    MPI_Bcast(&originMask, 1, MPI_INT, 0, MPI_COMM_WORLD);
-    MPI_Bcast(&(projectorMask->volumePaddedSize), 1, MPI_INT, 0, MPI_COMM_WORLD);
-    MPI_Bcast(&projectorMask->volumeSize, 1, MPI_INT, 0, MPI_COMM_WORLD);
+        MPI_Bcast(&realSize, 1, MPI_INT, 0, MPI_COMM_WORLD);
+        MPI_Bcast(&origin, 1, MPI_INT, 0, MPI_COMM_WORLD);
+        MPI_Bcast(&(projector->volumePaddedSize), 1, MPI_INT, 0, MPI_COMM_WORLD); 
+        MPI_Bcast(&projector->volumeSize, 1, MPI_INT, 0, MPI_COMM_WORLD);
 
-    if (rank != 0)
-    {
-        projector->VfourierRealCoefs.resizeNoCopy(realSize,realSize,realSize);
-        projector->VfourierImagCoefs.resizeNoCopy(realSize,realSize,realSize);
-        STARTINGX(projector->VfourierRealCoefs)=STARTINGY(projector->VfourierRealCoefs)=STARTINGZ(projector->VfourierRealCoefs)=origin;
-        STARTINGX(projector->VfourierImagCoefs)=STARTINGY(projector->VfourierImagCoefs)=STARTINGZ(projector->VfourierImagCoefs)=origin;
+        MPI_Bcast(&realSizeMask, 1, MPI_INT, 0, MPI_COMM_WORLD);
+        MPI_Bcast(&originMask, 1, MPI_INT, 0, MPI_COMM_WORLD);
 
-        projectorMask->VfourierRealCoefs.resizeNoCopy(realSizeMask,realSizeMask,realSizeMask);
-        projectorMask->VfourierImagCoefs.resizeNoCopy(realSizeMask,realSizeMask,realSizeMask);
-        STARTINGX(projectorMask->VfourierRealCoefs)=STARTINGY(projectorMask->VfourierRealCoefs)=STARTINGZ(projectorMask->VfourierRealCoefs)=originMask;
-        STARTINGX(projectorMask->VfourierImagCoefs)=STARTINGY(projectorMask->VfourierImagCoefs)=STARTINGZ(projectorMask->VfourierImagCoefs)=originMask;
-    }
+        if (rank != 0)
+        {
+            projector->VfourierRealCoefs.resizeNoCopy(realSize,realSize,realSize);
+            projector->VfourierImagCoefs.resizeNoCopy(realSize,realSize,realSize);
+            STARTINGX(projector->VfourierRealCoefs)=STARTINGY(projector->VfourierRealCoefs)=STARTINGZ(projector->VfourierRealCoefs)=origin;
+            STARTINGX(projector->VfourierImagCoefs)=STARTINGY(projector->VfourierImagCoefs)=STARTINGZ(projector->VfourierImagCoefs)=origin;
+        }
 
-    MPI_Bcast(MULTIDIM_ARRAY(projector->VfourierRealCoefs), (int)MULTIDIM_SIZE(projector->VfourierRealCoefs), MPI_DOUBLE, 0, MPI_COMM_WORLD);
-    MPI_Bcast(MULTIDIM_ARRAY(projector->VfourierImagCoefs), (int)MULTIDIM_SIZE(projector->VfourierImagCoefs), MPI_DOUBLE, 0, MPI_COMM_WORLD);
-    MPI_Bcast(MULTIDIM_ARRAY(projectorMask->VfourierRealCoefs), (int)MULTIDIM_SIZE(projectorMask->VfourierRealCoefs), MPI_DOUBLE, 0, MPI_COMM_WORLD);
-    MPI_Bcast(MULTIDIM_ARRAY(projectorMask->VfourierImagCoefs), (int)MULTIDIM_SIZE(projectorMask->VfourierImagCoefs), MPI_DOUBLE, 0, MPI_COMM_WORLD);
+        MPI_Bcast(MULTIDIM_ARRAY(projector->VfourierRealCoefs), (int)MULTIDIM_SIZE(projector->VfourierRealCoefs), MPI_DOUBLE, 0, MPI_COMM_WORLD);
+        MPI_Bcast(MULTIDIM_ARRAY(projector->VfourierImagCoefs), (int)MULTIDIM_SIZE(projector->VfourierImagCoefs), MPI_DOUBLE, 0, MPI_COMM_WORLD);
 
-    if (rank != 0)
-    {
-        projector->produceSideInfoProjection();
-        projectorMask->produceSideInfoProjection();
+        if (rank != 0)
+        {
+            projector->produceSideInfoProjection();
+        }
     }
 
     MetaData &mdIn = *getInputMd();

src/xmipp/libraries/parallel/mpi_subtract_projection.h

@@ -1,6 +1,7 @@
 /***************************************************************************
  *
- * Authors:  Estrella Fernandez Gimenez ([email protected])
+ * Authors:     Estrella Fernandez Gimenez ([email protected])
+ * 				Federico P. de Isidro-Gomez ([email protected])
  *
  * Unidad de  Bioinformatica of Centro Nacional de Biotecnologia , CSIC
  *
@@ -27,6 +28,7 @@
 #include <parallel/xmipp_mpi.h>
 #include <reconstruction/subtract_projection.h>
 
+#define DEBUG
 
 class MpiProgSubtractProjection: public ProgSubtractProjection, public MpiMetadataProgram
 {

src/xmipp/libraries/reconstruction/project.cpp

@@ -107,8 +107,8 @@ void ProgProject::defineParams()
     addParamsLine("                                              :+++                        %BR% ");
     addParamsLine("                                              : pad: controls the padding factor.");
     addParamsLine("                                              :+++                        %BR% ");
-    addParamsLine("                                              : maxfreq: is the maximum frequency for the pixels and by default ");
-    addParamsLine("                                              : pixels with frequency more than 0.25 are not considered.");
+    addParamsLine("                                              : maxfreq: is the maximum frequency for the projected pixels normalized to Nyquist=0.5");
+    addParamsLine("                                              : and by default pixels with frequency more than 0.25 are not considered.");
     addParamsLine("                                              :+++                        %BR% ");
     addParamsLine("                                              : interp: is the method for interpolation and the values can be: ");
     addParamsLine("                                              :+++                        %BR% ");
@@ -988,8 +988,11 @@ int PROJECT_Effectively_project(const FileName &fnOut,
     FourierProjector *Vfourier=nullptr;
     if (projType == SHEARS && side.phantomMode==PROJECT_Side_Info::VOXEL)
         Vshears=new RealShearsInfo(side.phantomVol());
-    if (projType == FOURIER && side.phantomMode==PROJECT_Side_Info::VOXEL)//////////////////////
+    if (projType == FOURIER && side.phantomMode==PROJECT_Side_Info::VOXEL)
         Vfourier=new FourierProjector(side.phantomVol(),side.paddFactor,side.maxFrequency,side.BSplineDeg);
+        #ifdef DEBUG
+        std::cout << "FourierProjector(side.phantomVol(),"<<side.paddFactor<<","<<side.maxFrequency<<","<<side.BSplineDeg<<");"<< std::endl;
+        #endif
                                      ///                   1              .5                        NEAREST
     fn_proj=fnOut;
     if (side.doCrystal)