Accelerated preprocessing

small correction

PyHST/Control.py

+
 #/*##########################################################################
 # Copyright (C) 2001-2013 European Synchrotron Radiation Facility
 #
@@ -123,29 +124,37 @@ class Control:
                                                           )
                 reading1.NEXTPOOL= [preprocessing]
             else:   # pour les cas encombrants
+                if DO_FF2:
+                    tobefreed = ["SiliciumResources"]
+                else:
+                    tobefreed = preprocessing_frees
+                    
                 preprocessing0 = Processing_InterleavedReadingPreProcessing( processingLevel=2,
                                                                             resources={"SiliciumResources":self.SiliciumResources ,
                                                                                        "RawDataResources":self.RawDataResources ,
                                                                                        "TreatedDataResources":self.TreatedDataResources ,
                                                                                        },
-                                                                            resources_free = ["SiliciumResources"],
+                                                                            resources_free = tobefreed,
                                                                             pmanager =  self.PacketsManager,
                                                                             STEAM_DIRECTION = STEAM_DIRECTION, FF2=DO_FF2*1
                                                                             )
                 start.NEXTPOOL= [preprocessing0]
+                if DO_FF2 :
                 # The threads are done computing their local mean. Now, one thread will reduce the results,
                 # And the process 0 will accumulate all the means
-                preprocessing = Processing_InterleavedReadingPreProcessing( processingLevel=4,
-                                                                            resources={"SiliciumResources":self.SiliciumResources ,
-                                                                                       "RawDataResources":self.RawDataResources ,
-                                                                                       "TreatedDataResources":self.TreatedDataResources ,
+                    preprocessing = Processing_InterleavedReadingPreProcessing( processingLevel=4,
+                                                                                resources={"SiliciumResources":self.SiliciumResources ,
+                                                                                           "RawDataResources":self.RawDataResources ,
+                                                                                           "TreatedDataResources":self.TreatedDataResources ,
                                                                                        },
-                                                                            resources_free = preprocessing_frees,
-                                                                            pmanager =  self.PacketsManager,
-                                                                            STEAM_DIRECTION = STEAM_DIRECTION, FF2=DO_FF2*2
+                                                                                resources_free = preprocessing_frees,
+                                                                                pmanager =  self.PacketsManager,
+                                                                                STEAM_DIRECTION = STEAM_DIRECTION, FF2=DO_FF2*2
                                                                             )
-                preprocessing0.NEXTPOOL= [preprocessing]
-
+                    preprocessing0.NEXTPOOL= [preprocessing]
+                else:
+                    preprocessing = preprocessing0
+                    
             ## -----------------------------------------------------------------------------
             
 
@@ -825,7 +834,7 @@ class Processing_InterleavedReadingPreProcessing(ProcessingBaseClass):
     
 
         ## -----------------  data for specific requirement. Resources know their name -----------------------------
-        self.requiredCpusGpus  = [ [0*P.ncpus_expansion ]  , 0 ]
+        self.requiredCpusGpus  = [ [1*P.ncpus_expansion ]  , 0 ]
         
         
     def processSpecial(self,psn  ):

PyHST/test/test_crayon.py

@@ -306,7 +306,7 @@ def test_classes(testcase):
     myclassi={}
     casi = {
         # "CRAYON/TESTS/"                 : ( False     , 0,[ "pag_una"]),
-        # "CRAYON/TESTS/"                 : ( False     , 0,[ "abs_solo_tutte", "abs_solo_unaslice", "pag_molte_edf", "pag_tutte", "pag_una"]),
+        "CRAYON/TESTS/"                 : ( False     , 0,[ "abs_solo_tutte", "abs_solo_unaslice", "pag_molte_edf", "pag_tutte", "pag_una"]),
         # "HELICOIDAL/TESTS/"              : ( False      , 0,[ "abs_solo_una"]),
         # "ID11_SNOW/TESTS/"              : ( False      , 1,[ "chambolle_pock"]),