try quadratic regularization

FerreolS · Oct 17, 2023 · 46fc190 · 46fc190
1 parent 1b39e5d
commit 46fc190
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/plugins/ferreol/demics/AmorsDEMIC.java b/src/plugins/ferreol/demics/AmorsDEMIC.java
@@ -422,14 +422,18 @@ protected void launch() {
 
 
 
-           	fprior = new HomogeneousHyperbolicTotalVariation(objectSpace, epsilon.getValue(), scale.getValue());
+           	//fprior = new HomogeneousHyperbolicTotalVariation(objectSpace, epsilon.getValue(), scale.getValue());
+            if  (singlePrecision.getValue()){
+                fprior = new QuadraticCost(new FiniteDifferenceOperator((FloatShapedVectorSpace)objectSpace));
+            }else{
+                fprior = new QuadraticCost(new FiniteDifferenceOperator((DoubleShapedVectorSpace) objectSpace));
+            }
             deconvolver  = new DeconvolutionJob( fdata,  mu.getValue(),fprior,  positivityEV.getValue(),nbIterDeconv.getValue(),  ObjectHook,  ObjectHookfinal);
 			curImager.show(objArray, "obj");
 
            	//PSFprior = new HomogeneousHyperbolicTotalVariation(objectSpace, epsilon.getValue(), scale.getValue());
 
 
-            // fprior = new HyperbolicTotalVariation(objectSpace, epsilon.getValue(), scale.getValue());
             if  (singlePrecision.getValue()){
                 PSFprior = new QuadraticCost(new FiniteDifferenceOperator((FloatShapedVectorSpace)objectSpace,BoundaryConditions.PERIODIC));
             }else{

diff --git a/src/plugins/ferreol/demics/SimpleDEMIC.java b/src/plugins/ferreol/demics/SimpleDEMIC.java
@@ -390,12 +390,12 @@ protected void launch() {
 
             buildVectorSpaces();
 
-            // fprior = new HyperbolicTotalVariation(objectSpace, epsilon.getValue(), scale.getValue());
-            if  (singlePrecision.getValue()){
+            fprior = new HyperbolicTotalVariation(objectSpace, epsilon.getValue(), scale.getValue());
+           /*  if  (singlePrecision.getValue()){
                 fprior = new QuadraticCost(new FiniteDifferenceOperator((FloatShapedVectorSpace)objectSpace,BoundaryConditions.PERIODIC));
             }else{
                 fprior = new QuadraticCost(new FiniteDifferenceOperator((DoubleShapedVectorSpace) objectSpace, BoundaryConditions.PERIODIC));
-            }
+            }*/
             fdata =  WeightedConvolutionCost.build( objectSpace, dataSpace);
             fdata.setData(dataArray);
             fdata.setWeights(wgtArray,true);