ready fro 2018b. Remains a problem with projections remaining zero

doc/conical_geometry.rst

@@ -8,5 +8,5 @@ Conical Geometry
  .. automodule:: Parameters_module
      :noindex:
  .. autoclass:: Parameters
-     :members:     CONICITY,CONICITY_FAN,SOURCE_DISTANCE,DETECTOR_DISTANCE,SOURCE_Y,STEAM_INVERTER
+     :members:     CONICITY,CONICITY_FAN,SOURCE_DISTANCE,DETECTOR_DISTANCE,SOURCE_Y,SOURCE_X,STEAM_INVERTER
 

scripts_link/pyhst2_info

 #!python
 msg = """
-The pyhst2 script launches PyHST2_2018a
+The pyhst2 script launches PyHST2_2018b
+
+   ***  PyHST2_2018b
+
+         -- correction for optics distortion :
+                see keys DISTORTION_FILE 
+         ---  A current can be read from the images header for normalisation
+                   key CURRENT_NAME
+                   such name is searched in the header
+                   Both projection and flat fiels are normalised by this current.
+         --- FBFILTER can be selected in the interval ]4,5]
+             In this case a modified ramp filter is used and the float number alpha = (FBFILTER-4 ), 
+             which goes from 0 to 1
+             is used a parameter to vary the ramp filter according to 
+                 fabs(x) - alpha*x*x
+             where x from 0 to 1/2 is the ramp coordinate.
+
    *** PyHST2_2018a
         -- Corrected a bug in multipaganin
 

scripts_link/pyhst2_unstable_info

 #!python
 msg = """
-The pyhst2_unstable script launches PyHST2_2018a
+The pyhst2 script launches PyHST2_2018b
+
+   ***  PyHST2_2018b
+
+         -- correction for optics distortion :
+                see keys DISTORTION_FILE 
+         ---  A current can be read from the images header for normalisation
+                   key CURRENT_NAME
+                   such name is searched in the header
+                   Both projection and flat fiels are normalised by this current.
+         --- FBFILTER can be selected in the interval ]4,5]
+             In this case a modified ramp filter is used and the float number alpha = (FBFILTER-4 ), 
+             which goes from 0 to 1
+             is used a parameter to vary the ramp filter according to 
+                 fabs(x) - alpha*x*x
+             where x from 0 to 1/2 is the ramp coordinate.
+
    *** PyHST2_2018a
         -- Corrected a bug in multipaganin
 
         -- implemented the new Paganin formula
 
-        -- Corrected a bug n Control.py which was causing a stall in certain cases
-
+        -- Corrected a bug in Control.py which was causing a stall in certain cases
 
+ 
    *** PyHST2_2017c
        --  a module for unsharp3D with GPU on already recontructed Volume
 
@@ -65,7 +81,28 @@ The pyhst2_unstable script launches PyHST2_2018a
             -- SIRT Filter
 
 
-   previous features
+   *** PyHST2_2017a
+  
+             -- doc at http://forge.epn-campus.eu/projects/pyhst2
+
+             -- wavelets regularisation
+
+   *** PyHST2_2016d
+
+            --  Local tomography
+ 
+            -- Double FlatFiled on the fly: DOUBLEFFCORRECTION_ONTHEFLY
+
+            -- Munch Filter for rings
+
+            -- NEURAL Filters
+
+            -- SIRT Filter
+
+            -- Ring Corrections in iterative methods
+
+   *** PyHST2_2015d
+       
 
              --  Helical scans ( works in parallel geometry adnd with/without Paganin )
 

setup.py

@@ -75,9 +75,9 @@ ONLYCUDA=0
 DO_LINK=0
 
 ### CHANGE HERE
-DOCUDA   = 1
+DOCUDA   = 0
 ONLYCUDA = 0
-DO_LINK  = 0
+DO_LINK  = 2
 
 global version
 global aumento_versione
@@ -90,7 +90,7 @@ if DO_LINK==0:
         os.path.abspath(__file__)), "PyHST", "__init__.py"))
                if l.strip().startswith("version")][0]
 else:
-    version = "2018a"
+    version = "2018b"
     
 print " LA VERSIONE EST ", version
 
@@ -138,7 +138,7 @@ def do_link_unstable():
     global version
     aumento_versione=""
 
-    version = "2018a"
+    version = "2018b"
 
     packages = []
 
@@ -382,7 +382,7 @@ def do_pyhst():
 
     cmdclass['build_ext'] = custom_build_ext
 
-
+    CUDA={'include':[]}
     if DOCUDA:
         CUDA = locate_cuda()
         CUDA["arch"] = ["-gencode", "arch=compute_20,code=compute_20",