diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index fd423874aa907ffcf1db14aaf12690183d693031..8db337c55598e313deb6ae616276e0b88690ef21 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -1600,23 +1600,15 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
      
       gdat_data.ec.ec_inputs = ec_inputs;  
                          
-      % introduce flag to check whether ec_data could be retrieved
-      % successfully
+      % introduce flag to check whether ec_data could be retrieved successfully
       filled_successfully = false;
       
       if strcmp(lower(source_icd.ec),'toray') 
         try % fill ec_data from TORAY via astra_tcv_exp outputs
-          if isempty(gdat_data.gdat_params.trialindx)
-            % centralized function for toray nodes
-            [pabs_gyro,icdtot,pow_dens,currentdrive_dens,rho_dep_pow,drho_pow,...
-              pmax,icdmax,currentdrive_dens_w2,rho_dep_icd,drho_icd,~,power_integrated,currentdrive_integrated] = ...
-              astra_tcv_EC_exp(shot,[],[],[],[],[],[],1);
-          else
-            % centralized function for toray nodes
-            [pabs_gyro,icdtot,pow_dens,currentdrive_dens,rho_dep_pow,drho_pow,...
-              pmax,icdmax,currentdrive_dens_w2,rho_dep_icd,drho_icd,~,power_integrated,currentdrive_integrated] = ...
-              astra_tcv_EC_exp(shot,[],[],[],[],[],gdat_data.gdat_params.trialindx,1);
-          end
+          % centralized function for toray nodes
+          [pabs_gyro,icdtot,pow_dens,currentdrive_dens,rho_dep_pow,drho_pow,...
+            pmax,icdmax,currentdrive_dens_w2,rho_dep_icd,drho_icd,~,power_integrated,currentdrive_integrated] = ...
+            astra_tcv_EC_exp(shot,[],[],[],[],[],gdat_data.gdat_params.trialindx,1);
           if gdat_data.mapping_for.tcv.gdat_timedim ==2
             tgrid_to_change = {'pabs_gyro','icdtot','pow_dens','currentdrive_dens','rho_dep_pow','drho_pow','pmax', ...
                                'icdmax','currentdrive_dens_w2','rho_dep_icd','drho_icd'};