Changeset 885

Timestamp:

10/30/2009 04:50:27 PM (2 months ago)

Author:

brodylab

Message:

--

Files:

• trunk/@RewardDiscounting2/RewardDiscounting2.m (modified) (4 diffs)

trunk/@RewardDiscounting2/RewardDiscounting2.m

@@ -324 +324 @@
-        pd.hit    = value(hit_history);
-        
+        pre_left        = get_sphandle('name','left_gap_Min');
+        pre_right       = get_sphandle('name','right_gap_Min');
+        
+        post_left       = get_sphandle('name','Left_PostReward');
+        post_right      = get_sphandle('name','Right_PostReward');
+        
-        choose_left     = get_sphandle('name','Choose_Left');
-        choose_right    = get_sphandle('name','Choose_Right');
@@ -336 +342 @@
-        reward_ratio    = get_sphandle('name','Reward_Ratio');
-        
+        ID1 = get_sphandle('name','Indifference1');
+        ID2 = get_sphandle('name','Indifference2');
+        ID3 = get_sphandle('name','Indifference3');
+        ID4 = get_sphandle('name','Indifference4');
+        ID5 = get_sphandle('name','Indifference5');
+        ID6 = get_sphandle('name','Indifference6');
+        ID7 = get_sphandle('name','Indifference7');
+        ID8 = get_sphandle('name','Indifference8');
+        
+        pd.pre_left        = cell2mat(get_history(pre_left{1}));
+        pd.pre_right       = cell2mat(get_history(pre_right{1}));
+        pd.post_left       = cell2mat(get_history(post_left{1}));
+        pd.post_right      = cell2mat(get_history(post_right{1}));
-        pd.choose_left     = cell2mat(get_history(choose_left{1}));
-        pd.choose_right    = cell2mat(get_history(choose_right{1}));
@@ -344 +363 @@
-        pd.duration_ratio  = cell2mat(get_history(duration_ratio{1}));
-        pd.reward_ratio    = cell2mat(get_history(reward_ratio{1}));
-
+
+
+
+
+
+
+
+
+
-                fds=fieldnames(pd);
-                for fi=1:numel(fds),
@@ -350 +377 @@
-        end
-        
-
+
+
-        
-        SessionDefinition(obj, 'run_eod_logic_without_saving');