Replacing samplingRate, timecourseLen variable names

Replaced to be meaningful
svndl · May 25, 2022 · 2413ceb · 2413ceb
1 parent 716148a
commit 2413ceb
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 14 deletions.
diff --git a/common/rcaExtra_getRCARunSettings.m b/common/rcaExtra_getRCARunSettings.m
@@ -8,10 +8,10 @@
     switch infoStruct.domain
         case 'time'
             DAQSR = 420; % data acquisition sampling rate
-            runSettings.timecourseLen = 1000./infoStruct.info.frequenciesHz; % Duration of a frequency cycle, ms 
+            runSettings.cycleDuration = 1000./infoStruct.info.frequenciesHz; % Duration of a frequency cycle, ms 
 
             % parameters that will be checked when loading RC result:
-            runSettings.samplingRate = round(DAQSR./infoStruct.info.frequenciesHz); % Number of datasamples for one frequency cycle
+            runSettings.cycleLength = round(DAQSR./infoStruct.info.frequenciesHz); % Number of datasamples for one frequency cycle
 
         case 'freq'            
             runSettings.dataType = 'RLS';

diff --git a/common/rcaExtra_getStatsSettings.m b/common/rcaExtra_getStatsSettings.m
@@ -4,8 +4,8 @@
     statSettings.domain = rcInfoStruct.domain;
     switch statSettings.domain
         case 'time'
-            statSettings.samplingRate = rcInfoStruct.samplingRate;
-            statSettings.timecourseLen = rcInfoStruct.timecourseLen;
+            statSettings.cycleLength = rcInfoStruct.cycleLength;
+            statSettings.cycleDuration = rcInfoStruct.cycleDuration;
             % copy defaults for time-domain test permute
             statSettings.tParams = {'dim', 2, 'alpha', 0.05};
             statSettings.deletePool = true;

diff --git a/time/averageSensor_time.m b/time/averageSensor_time.m
@@ -1,8 +1,8 @@
 function sensorResult = averageSensor_time(currSettings, dataIn)
     % resample data if needed
     resampled_data = dataIn;
-    if (size(dataIn{1, 1}, 1) ~= currSettings.samplingRate)
-        resampled_data = resampleData(dataIn, currSettings.samplingRate);
+    if (size(dataIn{1, 1}, 1) ~= currSettings.cycleLength)
+        resampled_data = resampleData(dataIn, currSettings.cycleLength);
     end
     if (~isempty(currSettings.useCnds))
         dataSlice = resampled_data(:, currSettings.useCnds);
@@ -31,7 +31,7 @@
     sensorResult.s_cnd = cat(3, s_cnd{:});
 
 
-    tc = linspace(0, currSettings.timecourseLen - 1, currSettings.samplingRate);
+    tc = linspace(0, currSettings.cycleLength - 1, currSettings.cycleDuration);
     sensorResult.timecourse = tc;
     sensorResult.rcaSettings = currSettings;
     sensorResult.projectedData = dataIn;

diff --git a/time/rcaExtra_compareRCASettings_time.m b/time/rcaExtra_compareRCASettings_time.m
@@ -10,7 +10,7 @@
     diff_nreg = (settingsLoaded.nReg == settingsCurrent.nReg);
 
     % compare frequencies
-    diff_freq = (settingsLoaded.samplingRate == settingsCurrent.samplingRate);
+    diff_freq = (settingsLoaded.cycleLength == settingsCurrent.cycleLength);
 
     % compare conditions
     try

diff --git a/time/runRCA_time.m b/time/runRCA_time.m
@@ -2,8 +2,8 @@
 
     % resample data if needed
     resampled_data = dataIn;
-    if (size(dataIn{1, 1}, 1) ~= currSettings.samplingRate)
-        resampled_data = resampleData(dataIn, currSettings.samplingRate);
+    if (size(dataIn{1, 1}, 1) ~= currSettings.cycleLength)
+        resampled_data = resampleData(dataIn, currSettings.cycleLength);
     end
     if (~isempty(currSettings.useCnds))
         dataSlice = resampled_data(:, currSettings.useCnds);
@@ -12,7 +12,7 @@
     end
     disp(['Running RC on ' currSettings.label ' dataset']);    
     matFileRCA = fullfile(currSettings.destDataDir_RCA, ['rcaResults_Time_' currSettings.label '.mat']);
-    tc = linspace(0, currSettings.timecourseLen - 1, currSettings.samplingRate);
+    tc = linspace(0, currSettings.cycleDuration - 1, currSettings.cycleLength);
 
     %% run RCA
 
@@ -21,6 +21,7 @@
 
     % if file doesn't exst, run analysis and save results
     if(~exist(matFileRCA, 'file'))
+        disp("File not found, running RCA...")
         [rcaData, W, A, Rxx, Ryy, Rxy, dGen, ~] = rcaRun(dataSlice', currSettings.nReg, currSettings.nComp);
 
         rcaResult.W = W;
@@ -42,6 +43,26 @@
         try
             % new version structure
             load(matFileRCA, 'rcaResult');
+            overwrite_result = 0;
+
+            %% replacing old vars
+            if isfield(rcaResult.rcaSettings, 'timecourseLen')
+                rcaResult.rcaSettings.cycleDuration = rcaResult.rcaSettings.timecourseLen;                
+                rcaResult.rcaSettings = rmfield(rcaResult.rcaSettings, 'timecourseLen');
+                overwrite_result = 1;
+            end
+
+            if isfield(rcaResult.rcaSettings, 'samplingRate')
+                rcaResult.rcaSettings.cycleLength = rcaResult.rcaSettings.samplingRate;
+                rcaResult.rcaSettings = rmfield(rcaResult.rcaSettings, 'samplingRate');
+                overwrite_result = 1;
+
+            end
+
+            if(overwrite_result)
+                save(matFileRCA, 'rcaResult');
+            end
+
             if (~exist('rcaResult', 'var'))
                 % load old version structure
 
@@ -101,8 +122,7 @@
 
     %% flip the RC weights here
     %W_new = rcaExtra_adjustRCSigns(rcResults, rcSettings);
-
-    % average each subject's response
+   % average each subject's response
     subjMean_cell = cellfun(@(x) nanmean(x, 3), rcaResult.projectedData', 'uni', false)';
     nCnd = size(subjMean_cell, 2);
     subjMean_bycnd = cell(1, nCnd);
@@ -121,7 +141,8 @@
     mu_cnd = cellfun(@(x) nanmean(x, 3), subjMean_bycnd, 'uni', false);
     s_cnd = cellfun(@(x) nanstd(x, [], 3)/(sqrt(size(x, 3))), subjMean_bycnd, 'uni', false);
     rcaResult.mu_cnd = cat(3, mu_cnd{:});
-    rcaResult.s_cnd = cat(3, s_cnd{:});
+    rcaResult.s_cnd = cat(3, s_cnd{:});    
+    % for each condition, compute individual mean/std
 
     % compute stats if required
     sigResults = [];