Tried to work through compile trial Records - but not sure it works

balajisriram · Apr 23, 2018 · 8d77ccd · 8d77ccd
1 parent 8adfb96
commit 8d77ccd
Show file tree

Hide file tree

Showing 10 changed files with 237 additions and 374 deletions.
diff --git a/bootstrap/standAloneRun.m b/bootstrap/standAloneRun.m
@@ -81,7 +81,7 @@ function standAloneRun(subjectID,BCoreServerPath,setup)
         BCoreUtil.replicateTrialRecords({rx.standAlonePath},deleteOnSuccess);
     end
     [~, ~] = rx.emptyAllBoxes('done running trials in standAloneRun',auth);
-%     BCoreUtil.compileDetailedRecords(subjectID);
+%     BCoreUtil.compileRecords(subjectID);
     cleanup;
 catch ex
     disp(['CAUGHT ERROR: ' getReport(ex,'extended')])
@@ -93,7 +93,7 @@ function standAloneRun(subjectID,BCoreServerPath,setup)
     [~, ~] = rx.emptyAllBoxes('done running trials in standAloneRun',auth);
     cleanup;
     BCoreUtil.replicateTrialRecords({rx.standAlonePath},deleteOnSuccess);
-%     BCoreUtil.compileDetailedRecords(subjectID);
+%     BCoreUtil.compileRecords(subjectID);
     cleanup;
     rethrow(ex)
 end

diff --git a/classes/core/BCoreUtil.m b/classes/core/BCoreUtil.m
diff --git a/classes/core/protocols/stimManagers/stimManager.m b/classes/core/protocols/stimManagers/stimManager.m
@@ -757,7 +757,7 @@ function displayCumulativePhysAnalysis(sm,cumulativeData)
 
             % adding code to get details about reinforcement
             [out.potentialRewardMS,compiledLUT]                             = extractFieldAndEnsure(trialRecords, {'reinforcementManager','rewardSizeULorMS'},'scalar',compiledLUT);
-            [out.potentialRequestRewardMS,compiledLUT]                             = extractFieldAndEnsure(trialRecords, {'reinforcementManager','reinforcementManager','requestRewardSizeULorMS'},'scalar',compiledLUT);
+            [out.potentialRequestRewardMS,compiledLUT]                      = extractFieldAndEnsure(trialRecords, {'reinforcementManager','reinforcementManager','requestRewardSizeULorMS'},'scalar',compiledLUT);
             [out.potentialRewardScalar,compiledLUT]                         = extractFieldAndEnsure(trialRecords, {'reinforcementManager','reinforcementManager','scalar'},'scalar',compiledLUT);
             [out.potentialPenalty,compiledLUT]                              = extractFieldAndEnsure(trialRecords, {'reinforcementManager','reinforcementManager','msPenalty'},'scalar',compiledLUT);
 

diff --git a/classes/core/protocols/stimManagers/unfinished/contrastDynamics.m b/classes/core/protocols/stimManagers/unfinished/contrastDynamics.m
@@ -1139,7 +1139,7 @@ function displayCumulativePhysAnalysis(sm,cumulativedata,parameters)
             timeWindowFramesStim=ceil(timeWindowMsStim*(refreshRate/1000));
 
             if (ischar(stimulusDetails.strategy) && strcmp(stimulusDetails.strategy,'expert')) || ...
-                    (exist('fieldsInLUT','var') && ismember('stimDetails.strategy',fieldsInLUT) && strcmp(LUTlookup(sessionLUT,stimulusDetails.strategy),'expert'))
+                    (exist('fieldsInLUT','var') && ismember('stimDetails.strategy',fieldsInLUT) && strcmp(BCoreUtil.LUTlookup(sessionLUT,stimulusDetails.strategy),'expert'))
                 seeds=stimulusDetails.seedValues;
                 spatialDim = stimulusDetails.spatialDim;
 
@@ -1741,7 +1741,7 @@ function displayCumulativePhysAnalysis(sm,cumulativedata,parameters)
             end
 
             if (ischar(stimulusDetails.strategy) && strcmp(stimulusDetails.strategy,'expert')) || ...
-                    (exist('fieldsInLUT','var') && ismember('stimDetails.strategy',fieldsInLUT) && strcmp(LUTlookup(sessionLUT,stimulusDetails.strategy),'expert'))
+                    (exist('fieldsInLUT','var') && ismember('stimDetails.strategy',fieldsInLUT) && strcmp(BCoreUtil.LUTlookup(sessionLUT,stimulusDetails.strategy),'expert'))
                 seeds=stimulusDetails.seedValues;
                 spatialDim = stimulusDetails.spatialDim;
 

diff --git a/classes/core/protocols/stimManagers/unfinished/whiteNoise.m b/classes/core/protocols/stimManagers/unfinished/whiteNoise.m
@@ -1147,7 +1147,7 @@ function displayCumulativePhysAnalysis(sm,cumulativedata,parameters)
             timeWindowFramesStim=ceil(timeWindowMsStim*(refreshRate/1000));
 
             if (ischar(stimulusDetails.strategy) && strcmp(stimulusDetails.strategy,'expert')) || ...
-                    (exist('fieldsInLUT','var') && ismember('stimDetails.strategy',fieldsInLUT) && strcmp(LUTlookup(sessionLUT,stimulusDetails.strategy),'expert'))
+                    (exist('fieldsInLUT','var') && ismember('stimDetails.strategy',fieldsInLUT) && strcmp(BCoreUtil.LUTlookup(sessionLUT,stimulusDetails.strategy),'expert'))
                 seeds=stimulusDetails.seedValues;
                 spatialDim = stimulusDetails.spatialDim;
 

diff --git a/classes/core/protocols/stimManagers/unfinished/whiteNoiseBubble.m b/classes/core/protocols/stimManagers/unfinished/whiteNoiseBubble.m
@@ -1355,7 +1355,7 @@ function displayCumulativePhysAnalysis(sm,cumulativedata,parameters)
             timeWindowFramesStim=ceil(timeWindowMsStim*(refreshRate/1000));
 
             if (ischar(stimulusDetails.strategy) && strcmp(stimulusDetails.strategy,'expert')) || ...
-                    (exist('fieldsInLUT','var') && ismember('stimDetails.strategy',fieldsInLUT) && strcmp(LUTlookup(sessionLUT,stimulusDetails.strategy),'expert'))
+                    (exist('fieldsInLUT','var') && ismember('stimDetails.strategy',fieldsInLUT) && strcmp(BCoreUtil.LUTlookup(sessionLUT,stimulusDetails.strategy),'expert'))
                 seeds=stimulusDetails.seedValues;
                 spatialDim = stimulusDetails.spatialDim;
 

diff --git a/util/infrastructure/LUTlookup.m b/util/infrastructure/LUTlookup.m
diff --git a/util/other/matlaby/datenumFor30.m b/util/other/matlaby/datenumFor30.m
diff --git a/util/trials/addOrFindInLUT.m b/util/trials/addOrFindInLUT.m
diff --git a/util/trials/loadDetailedTrialRecords.m b/util/trials/loadDetailedTrialRecords.m