Changeset 1181 for trunk/src/series/civ_series.m

Timestamp:

May 21, 2025, 6:14:05 PM (13 days ago)

Author:

sommeria

Message:

image rescale included in civ_series input

File:

• trunk/src/series/civ_series.m (modified) (4 diffs)

trunk/src/series/civ_series.m

@@ -69 +69 @@
     Data.VelType='off';% menu for selecting the velocity type (options 'off'/'one'/'two',  'off' by default)
     Data.FieldName='on';% menu for selecting the field (s) in the input file(options 'off'/'one'/'two', 'off' by default)
-    Data.FieldTransform = 'on';%can use a transform function
+    Data.FieldTransform = 'off';%can use a transform function
     Data.ProjObject='off';%can use projection object(option 'off'/'on',
     Data.Mask='off';%can use mask option   (option 'off'/'on', 'off' by default)
@@ -258 +258 @@
 CheckRelabel=isfield(Param,'FileSeries' );%=true for index relabeling (PCO)
 
-%% introduce input image transform
-transform_fct=[];%default, no transform
-if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
-        currentdir=pwd;
-    cd(Param.FieldTransform.TransformPath)
-    transform_fct=str2func(Param.FieldTransform.TransformName);
-    cd (currentdir)
-end
+% %% introduce input image transform
+% transform_fct=[];%default, no transform
+% if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
+%         currentdir=pwd;
+%     cd(Param.FieldTransform.TransformPath)
+%     transform_fct=str2func(Param.FieldTransform.TransformName);
+%     cd (currentdir)
+% end
 
 %%%%% MAIN LOOP %%%%%%
@@ -445 +445 @@
         end
 
-
-        %% user defined image transform
-        if ~isempty(transform_fct)
-               par_civ1 =transform_fct(par_civ1,Param);
+ % case of image luminosity rescaling 
+      if par_civ1.CheckRescale &&~isempty(par_civ1.Maxtanh)
+               par_civ1.ImageA =par_civ1.Maxtanh*tanh(double(par_civ1.ImageA)/par_civ1.Maxtanh);
+               par_civ1.ImageB=par_civ1.Maxtanh*tanh(double(par_civ1.ImageB)/par_civ1.Maxtanh);
         end
         
@@ -672 +672 @@
         end
         
-                %% user defined image transform
-        if ~isempty(transform_fct)
-               par_civ2 =transform_fct(par_civ2,Param);
-        end
-        
+%                 %% user defined image transform
+%         if ~isempty(transform_fct)
+%                par_civ2 =transform_fct(par_civ2,Param);
+%         end
+         %% case of image luminosity rescaling 
+      if par_civ2.CheckRescale &&~isempty(par_civ2.Maxtanh)
+               par_civ2.ImageA =par_civ2.Maxtanh*tanh(double(par_civ2.ImageA)/par_civ2.Maxtanh);
+               par_civ2.ImageB=par_civ2.Maxtanh*tanh(double(par_civ2.ImageB)/par_civ2.Maxtanh);
+        end
         
         % get the guess from patch1 or patch2 (case 'CheckCiv3')