pvlv mostly working with new PTmaint, everything should be building now

emer · Apr 4, 2024 · 99561b9 · 99561b9
1 parent 2a49099
commit 99561b9
Show file tree

Hide file tree

Showing 28 changed files with 43 additions and 59 deletions.
diff --git a/axon/deep_net.go b/axon/deep_net.go
@@ -264,8 +264,8 @@ func (net *Network) AddPTMaintThalForSuper(super, ct *Layer, thalSuffix, prjnCla
 		pt.DefParams = params.Params{
 			"Layer.Acts.SMaint.On":  "true",
 			"Layer.Acts.GabaB.Gbar": "0.015",
-			"Layer.Inhib.Layer.Gi":  "2",
-			"Layer.Inhib.Pool.Gi":   "2",
+			"Layer.Inhib.Layer.Gi":  "0.5",
+			"Layer.Inhib.Pool.Gi":   "0.5",
 		}
 		if is4D {
 			pt.DefParams["Layer.Inhib.Pool.On"] = "true"
@@ -444,7 +444,7 @@ func (net *Network) AddPFC4D(name, thalSuffix string, nPoolsY, nPoolsX, nNeurY,
 	pfc.AddClass(layClass)
 	pfcCT.AddClass(layClass)
 	// prjns are: super->PT, PT self
-	pfcPT, pfcThal = net.AddPTMaintThalForSuper(pfc, pfcCT, thalSuffix, prjnClass, one2one, p1to1, p1to1, selfMaint, space)
+	pfcPT, pfcThal = net.AddPTMaintThalForSuper(pfc, pfcCT, thalSuffix, prjnClass, one2one, p1to1, one2one, selfMaint, space)
 	pfcPTp = net.AddPTPredLayer(pfcPT, pfcCT, p1to1, p1to1, prjnClass, space)
 	pfcPTp.SetClass(name)
 	pfcPT.AddClass(layClass)

diff --git a/axon/gtigen.go b/axon/gtigen.go
diff --git a/axon/pvlv_layers.go b/axon/pvlv_layers.go
@@ -178,6 +178,7 @@ func (ly *Layer) BLADefaults() {
 	lp.CT.DecayTau = 0
 	lp.CT.GeGain = 0.1 // 0.1 has effect, can go a bit lower if need to
 
+	lp.Learn.NeuroMod.DAModGain = 0.5
 	if isAcq {
 		lp.Learn.NeuroMod.DALRateMod = 0.5
 		lp.Learn.NeuroMod.BurstGain = 0.2

diff --git a/axon/pvlv_net.go b/axon/pvlv_net.go
@@ -493,9 +493,9 @@ func (net *Network) AddPVLVPulvLayers(ctx *Context, nYneur, popY, popX int, spac
 func (net *Network) AddOFCposUS(ctx *Context, nUSs, nY, ofcY, ofcX int, space float32) (ofc, ofcCT, ofcPT, ofcPTp, ofcMD *Layer) {
 	ofc, ofcCT, ofcPT, ofcPTp, ofcMD = net.AddPFC4D("OFCposUS", "MD", 1, nUSs, ofcY, ofcX, true, true, space)
 	ofc.DefParams["Layer.Inhib.Pool.Gi"] = "1"
-	ofcPT.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.2"
+	ofcPT.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.02"
 	ofcPT.DefParams["Layer.Inhib.Pool.On"] = "true"
-	ofcPT.DefParams["Layer.Inhib.Pool.Gi"] = "2.0"
+	// ofcPT.DefParams["Layer.Inhib.Pool.Gi"] = "2.0"
 	ofcPT.DefParams["Layer.Acts.Dend.ModACh"] = "true"
 	ofcPTp.DefParams["Layer.Inhib.Pool.Gi"] = "1.4"
 	ofcPTp.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.1"
@@ -511,8 +511,8 @@ func (net *Network) AddOFCnegUS(ctx *Context, nUSs, ofcY, ofcX int, space float3
 	ofc.DefParams["Layer.Inhib.Pool.Gi"] = "1"
 	ofc.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.1"
 	ofc.DefParams["Layer.Inhib.Layer.Gi"] = "1.2"
-	ofcPT.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.2"
-	ofcPT.DefParams["Layer.Inhib.Pool.Gi"] = "3.0"
+	// ofcPT.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.2"
+	// ofcPT.DefParams["Layer.Inhib.Pool.Gi"] = "3.0"
 	ofcPT.DefParams["Layer.Acts.Dend.ModACh"] = "true"
 	ofcPTp.DefParams["Layer.Inhib.Pool.Gi"] = "1.4"
 	ofcPTp.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.1"
@@ -529,8 +529,8 @@ func (net *Network) AddACCost(ctx *Context, nCosts, accY, accX int, space float3
 	acc.DefParams["Layer.Inhib.Pool.Gi"] = "1"
 	acc.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.1"
 	acc.DefParams["Layer.Inhib.Layer.Gi"] = "1.2"
-	accPT.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.2"
-	accPT.DefParams["Layer.Inhib.Pool.Gi"] = "3.0"
+	// accPT.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.2"
+	// accPT.DefParams["Layer.Inhib.Pool.Gi"] = "3.0"
 	accPT.DefParams["Layer.Acts.Dend.ModACh"] = "true"
 	accPTp.DefParams["Layer.Inhib.Pool.Gi"] = "1.4"
 	accPTp.DefParams["Layer.Inhib.ActAvg.Nominal"] = "0.1"
@@ -929,7 +929,7 @@ func (net *Network) AddPVLVOFCus(ctx *Context, nYneur, popY, popX, bgY, bgX, ofc
 // Makes all appropriate interconnections and sets default parameters.
 // Needs CS -> BLA, OFC connections to be made.
 // Returns layers most likely to be used for remaining connections and positions.
-func (net *Network) AddBOA(ctx *Context, nYneur, popY, popX, bgY, bgX, pfcY, pfcX int, space float32) (vSgpi, urgency, pvPos, blaPosAcq, blaPosExt, blaNegAcq, blaNegExt, blaNov, ofcPosUS, ofcPosUSCT, ofcPosUSPTp, ilPos, ilPosCT, ilPosPTp, ofcNegUS, ofcNegUSCT, ofcNegUSPTp, ilNeg, ilNegCT, ilNegPTp, accUtil, sc *Layer) {
+func (net *Network) AddBOA(ctx *Context, nYneur, popY, popX, bgY, bgX, pfcY, pfcX int, space float32) (vSgpi, urgency, pvPos, blaPosAcq, blaPosExt, blaNegAcq, blaNegExt, blaNov, ofcPosUS, ofcPosUSCT, ofcPosUSPT, ofcPosUSPTp, ilPos, ilPosCT, ilPosPT, ilPosPTp, ofcNegUS, ofcNegUSCT, ofcNegUSPT, ofcNegUSPTp, ilNeg, ilNegCT, ilNegPT, ilNegPTp, accUtil, sc *Layer) {
 
 	full := prjn.NewFull()
 	var pj *Prjn

diff --git a/axon/shaders/gpu_applyext.spv b/axon/shaders/gpu_applyext.spv
diff --git a/axon/shaders/gpu_betweengi.spv b/axon/shaders/gpu_betweengi.spv
diff --git a/axon/shaders/gpu_cycle.spv b/axon/shaders/gpu_cycle.spv
diff --git a/axon/shaders/gpu_cyclepost.spv b/axon/shaders/gpu_cyclepost.spv
diff --git a/axon/shaders/gpu_dwt.spv b/axon/shaders/gpu_dwt.spv
diff --git a/axon/shaders/gpu_dwtsubmean.spv b/axon/shaders/gpu_dwtsubmean.spv
diff --git a/axon/shaders/gpu_gather.spv b/axon/shaders/gpu_gather.spv
diff --git a/axon/shaders/gpu_laygi.spv b/axon/shaders/gpu_laygi.spv
diff --git a/axon/shaders/gpu_minuspool.spv b/axon/shaders/gpu_minuspool.spv
diff --git a/axon/shaders/gpu_newstate_neuron.spv b/axon/shaders/gpu_newstate_neuron.spv
diff --git a/axon/shaders/gpu_newstate_pool.spv b/axon/shaders/gpu_newstate_pool.spv
diff --git a/axon/shaders/gpu_plusneuron.spv b/axon/shaders/gpu_plusneuron.spv
diff --git a/axon/shaders/gpu_plusstart.spv b/axon/shaders/gpu_plusstart.spv
diff --git a/axon/shaders/gpu_poolgi.spv b/axon/shaders/gpu_poolgi.spv
diff --git a/axon/shaders/gpu_postspike.spv b/axon/shaders/gpu_postspike.spv
diff --git a/axon/shaders/gpu_sendspike.spv b/axon/shaders/gpu_sendspike.spv
diff --git a/axon/shaders/gpu_synca.spv b/axon/shaders/gpu_synca.spv
diff --git a/examples/boa/boa.go b/examples/boa/boa.go
@@ -215,7 +215,7 @@ func (ss *Sim) ConfigNet(net *axon.Network) {
 	ny := ev.Config.Params.NYReps
 	narm := ev.Config.NArms
 
-	vSgpi, urgency, pvPos, blaPosAcq, blaPosExt, blaNegAcq, blaNegExt, blaNov, ofcPosUS, ofcPosUSCT, ofcPosUSPTp, ilPos, ilPosCT, ilPosPTp, ofcNegUS, ofcNegUSCT, ofcNegUSPTp, ilNeg, ilNegCT, ilNegPTp, plUtil, sc := net.AddBOA(ctx, ny, popY, popX, nuBgY, nuBgX, nuCtxY, nuCtxX, space)
+	vSgpi, urgency, pvPos, blaPosAcq, blaPosExt, blaNegAcq, blaNegExt, blaNov, ofcPosUS, ofcPosUSCT, ofcPosUSPT, ofcPosUSPTp, ilPos, ilPosCT, ilPosPT, ilPosPTp, ofcNegUS, ofcNegUSCT, ofcNegUSPT, ofcNegUSPTp, ilNeg, ilNegCT, ilNegPT, ilNegPTp, plUtil, sc := net.AddBOA(ctx, ny, popY, popX, nuBgY, nuBgX, nuCtxY, nuCtxX, space)
 	_, _ = plUtil, urgency
 	_, _ = ofcNegUSCT, ofcNegUSPTp
 
@@ -235,18 +235,18 @@ func (ss *Sim) ConfigNet(net *axon.Network) {
 	m1, m1CT := net.AddSuperCT2D("M1", "PFCPrjn", nuCtxY, nuCtxX, space, one2one)
 	m1P := net.AddPulvForSuper(m1, space)
 
-	alm, almCT, almPT, almPTp, almMD := net.AddPFC2D("ALM", "MD", nuCtxY, nuCtxX, true, space)
+	alm, almCT, almPT, almPTp, almMD := net.AddPFC2D("ALM", "MD", nuCtxY, nuCtxX, true, true, space)
 	_ = almPT
 
 	net.ConnectLayers(vSgpi, almMD, full, axon.InhibPrjn)
 	// net.ConnectToMatrix(alm, vSmtxGo, full) // todo: explore
 	// net.ConnectToMatrix(alm, vSmtxNo, full)
 
-	net.ConnectToPFCBidir(m1, m1P, alm, almCT, almPTp, full) // alm predicts m1
+	net.ConnectToPFCBidir(m1, m1P, alm, almCT, almPT, almPTp, full, "M1ALM") // alm predicts m1
 
 	// vl is a predictive thalamus but we don't have direct access to its source
 	net.ConnectToPulv(m1, m1CT, vl, full, full, prjnClass)
-	net.ConnectToPFC(nil, vl, alm, almCT, almPTp, full) // alm predicts m1
+	net.ConnectToPFC(nil, vl, alm, almCT, almPT, almPTp, full, "VLALM") // alm predicts m1
 
 	// sensory inputs guiding action
 	// note: alm gets effort, pos via predictive coding below
@@ -275,22 +275,22 @@ func (ss *Sim) ConfigNet(net *axon.Network) {
 	net.ConnectToBLAExt(cs, blaNegExt, full)
 
 	// OFCus predicts cs
-	net.ConnectToPFCBack(cs, csP, ofcPosUS, ofcPosUSCT, ofcPosUSPTp, full)
-	net.ConnectToPFCBack(cs, csP, ofcNegUS, ofcNegUSCT, ofcNegUSPTp, full)
+	net.ConnectToPFCBack(cs, csP, ofcPosUS, ofcPosUSCT, ofcPosUSPT, ofcPosUSPTp, full, "CSToPFC")
+	net.ConnectToPFCBack(cs, csP, ofcNegUS, ofcNegUSCT, ofcPosUSPT, ofcNegUSPTp, full, "CSToPFC")
 
 	///////////////////////////////////////////
 	// OFC, ACC, ALM predicts pos
 
 	// todo: a more dynamic US rep is needed to drive predictions in OFC
 	// using distance and effort here in the meantime
-	net.ConnectToPFCBack(pos, posP, ofcPosUS, ofcPosUSCT, ofcPosUSPTp, full)
-	net.ConnectToPFCBack(pos, posP, ilPos, ilPosCT, ilPosPTp, full)
+	net.ConnectToPFCBack(pos, posP, ofcPosUS, ofcPosUSCT, ofcPosUSPT, ofcPosUSPTp, full, "PosToPFC")
+	net.ConnectToPFCBack(pos, posP, ilPos, ilPosCT, ilPosPT, ilPosPTp, full, "PosToPFC")
 
-	net.ConnectToPFC(pos, posP, ofcNegUS, ofcNegUSCT, ofcNegUSPTp, full)
-	net.ConnectToPFC(pos, posP, ilNeg, ilNegCT, ilNegPTp, full)
+	net.ConnectToPFC(pos, posP, ofcNegUS, ofcNegUSCT, ofcNegUSPT, ofcNegUSPTp, full, "PosToPFC")
+	net.ConnectToPFC(pos, posP, ilNeg, ilNegCT, ilNegPT, ilNegPTp, full, "PosToPFC")
 
 	//	alm predicts all effort, cost, sensory state vars
-	net.ConnectToPFC(pos, posP, alm, almCT, almPTp, full)
+	net.ConnectToPFC(pos, posP, alm, almCT, almPT, almPTp, full, "PosToPFC")
 
 	///////////////////////////////////////////
 	// ALM, M1 <-> OFC, ACC

diff --git a/examples/pcore_ds/params.go b/examples/pcore_ds/params.go
@@ -55,7 +55,7 @@ var ParamSets = netparams.Sets{
 			}},
 		{Sel: ".PTMaintLayer", Desc: "time integration params",
 			Params: params.Params{
-				"Layer.Inhib.Layer.Gi":      "2.2",   // 2.2 def
+				// "Layer.Inhib.Layer.Gi":      "2.2",   // 2.2 def
 				"Layer.Acts.Dend.ModGain":   "1.0",   // 1.5 def
 				"Layer.Acts.Kir.Gbar":       "0",     // no real diff here over range 0-10
 				"Layer.Acts.MaintNMDA.Gbar": "0.007", // 0.007 default
@@ -107,13 +107,6 @@ var ParamSets = netparams.Sets{
 			Hypers: params.Hypers{
 				"Prjn.PrjnScale.Abs": {"Tweak": "-"},
 			}},
-		{Sel: ".PTSelfMaint", Desc: "",
-			Params: params.Params{
-				"Prjn.PrjnScale.Abs": "1", // 1 def
-			},
-			Hypers: params.Hypers{
-				"Prjn.PrjnScale.Abs": {"Tweak": "-"},
-			}},
 		{Sel: ".SuperToThal", Desc: "",
 			Params: params.Params{
 				"Prjn.PrjnScale.Abs": "3.0", // 3

diff --git a/examples/pcore_ds/pcore_ds.go b/examples/pcore_ds/pcore_ds.go
@@ -221,12 +221,12 @@ func (ss *Sim) ConfigNet(net *axon.Network) {
 	vl := net.AddPulvLayer4D("VL", 1, nAct, nuPer, 1) // VL predicts brainstem Action
 	vl.SetBuildConfig("DriveLayName", motor.Name())
 
-	m1, m1CT, m1PT, m1PTp, m1VM := net.AddPFC2D("M1", "VM", nuCtxY, nuCtxX, false, space)
+	m1, m1CT, m1PT, m1PTp, m1VM := net.AddPFC2D("M1", "VM", nuCtxY, nuCtxX, false, true, space)
 	_ = m1PT
 	// todo: M1PTp should be VL interconnected, prior to PT, not after it.
 
 	// vl is a predictive thalamus but we don't have direct access to its source
-	net.ConnectToPFC(nil, vl, m1, m1CT, m1PTp, full) // m1 predicts vl
+	net.ConnectToPFC(nil, vl, m1, m1CT, m1PT, m1PTp, full, "VLM1") // m1 predicts vl
 
 	// these projections are *essential* -- must get current state here
 	net.ConnectLayers(m1, vl, full, axon.ForwardPrjn).SetClass("ToVL")

diff --git a/examples/pcore_vs/params.go b/examples/pcore_vs/params.go
@@ -37,7 +37,7 @@ var ParamSets = netparams.Sets{
 			}},
 		{Sel: ".PTMaintLayer", Desc: "time integration params",
 			Params: params.Params{
-				"Layer.Inhib.Layer.Gi":    "3.2", // 3.2 def
+				// "Layer.Inhib.Layer.Gi":    "3.2", // 3.2 def
 				"Layer.Acts.Dend.ModGain": "1.5", // 1.5 def
 				"Layer.Acts.Kir.Gbar":     "0",   // no real diff here over range 0-10
 				"Layer.Acts.Dend.ModACh":  "true",
@@ -71,10 +71,6 @@ var ParamSets = netparams.Sets{
 			Params: params.Params{
 				"Prjn.PrjnScale.Abs": "0.5",
 			}},
-		{Sel: ".PTSelfMaint", Desc: "",
-			Params: params.Params{
-				"Prjn.PrjnScale.Abs": "4",
-			}},
 		{Sel: ".SuperToThal", Desc: "",
 			Params: params.Params{
 				"Prjn.PrjnScale.Abs": "3.0", // was 4

diff --git a/examples/pcore_vs/pcore_vs.go b/examples/pcore_vs/pcore_vs.go
@@ -206,7 +206,7 @@ func (ss *Sim) ConfigNet(net *axon.Network) {
 	accPos.SetClass("ACC")
 	accNeg.SetClass("ACC")
 
-	accPosPT, accPosVM := net.AddPTMaintThalForSuper(accPos, nil, "VM", "PFCPrjn", one2one, full, one2one, space)
+	accPosPT, accPosVM := net.AddPTMaintThalForSuper(accPos, nil, "VM", "PFCPrjn", one2one, full, one2one, true, space)
 	_ = accPosPT
 
 	net.ConnectLayers(accPos, stn, full, axon.ForwardPrjn).SetClass("CortexToSTN")

diff --git a/examples/pvlv/params.go b/examples/pvlv/params.go
@@ -55,16 +55,8 @@ var ParamSets = netparams.Sets{
 		{Sel: ".PTMaintLayer", Desc: "time integration params",
 			Params: params.Params{
 				"Layer.Acts.Dend.ModGain": "1.5",
-				"Layer.Inhib.Layer.Gi":    "3.0",
-				"Layer.Inhib.Pool.Gi":     "3.6",
-			}},
-		{Sel: ".PTSelfMaint", Desc: "",
-			Params: params.Params{
-				"Prjn.PrjnScale.Abs": "4.0", // note: too much! need a better strat
-			}},
-		{Sel: "#OFCposUSPTToOFCposUSPT", Desc: "",
-			Params: params.Params{
-				"Prjn.PrjnScale.Abs": "5", // 4 needed to sustain
+				// "Layer.Inhib.Layer.Gi":    "3.0",
+				// "Layer.Inhib.Pool.Gi":     "3.6",
 			}},
 		{Sel: ".PTPredLayer", Desc: "",
 			Params: params.Params{
@@ -76,11 +68,12 @@ var ParamSets = netparams.Sets{
 			}},
 		{Sel: "#OFCposUSPTp", Desc: "",
 			Params: params.Params{
-				"Layer.Inhib.Pool.Gi": "1.0",
+				"Layer.Inhib.Pool.Gi":        "0.5",
+				"Layer.Inhib.ActAvg.Nominal": "0.02",
 			}},
 		{Sel: "#OFCposUSPT", Desc: "",
 			Params: params.Params{
-				"Layer.Inhib.Pool.Gi": "3.6",
+				"Layer.Acts.SMaint.Gbar": "0.4",
 			}},
 		{Sel: "#SC", Desc: "",
 			Params: params.Params{
@@ -137,7 +130,7 @@ var ParamSets = netparams.Sets{
 			Params: params.Params{
 				"Prjn.PrjnScale.Abs":        "3",
 				"Prjn.Learn.Trace.LearnThr": "0",
-				"Prjn.Learn.LRate.Base":     "0.05", // 0.05 def -- good
+				"Prjn.Learn.LRate.Base":     "0.02", // 0.05 def -- good
 			}},
 		{Sel: ".ToPTp", Desc: "",
 			Params: params.Params{

diff --git a/examples/pvlv/pvlv.go b/examples/pvlv/pvlv.go
@@ -193,14 +193,15 @@ func (ss *Sim) ConfigNet(net *axon.Network) {
 	stim := ev.CurStates["CS"]
 	ctxt := ev.CurStates["ContextIn"]
 
-	vSgpi, vSmtxGo, vSmtxNo, vSpatchD1, vSpatchD2, urgency, usPos, pvPos, usNeg, usNegP, pvNeg, pvNegP, blaPosAcq, blaPosExt, blaNegAcq, blaNegExt, blaNov, ofcPosUS, ofcPosUSCT, ofcPosUSPTp, ilPos, ilPosCT, ilPosPTp, ilPosMD, ofcNegUS, ofcNegUSCT, ofcNegUSPTp, accCost, accCostCT, accCostPTp, ilNeg, ilNegCT, ilNegPTp, ilNegMD, sc := net.AddPVLVOFCus(&ss.Context, ny, popY, popX, nuBgY, nuBgX, nuCtxY, nuCtxX, space)
+	vSgpi, vSmtxGo, vSmtxNo, vSpatchD1, vSpatchD2, urgency, usPos, pvPos, usNeg, usNegP, pvNeg, pvNegP, blaPosAcq, blaPosExt, blaNegAcq, blaNegExt, blaNov, ofcPosUS, ofcPosUSCT, ofcPosUSPTp, ofcPosUSPT, ilPos, ilPosCT, ilPosPT, ilPosPTp, ilPosMD, ofcNegUS, ofcNegUSCT, ofcNegUSPT, ofcNegUSPTp, accCost, accCostCT, accCostPT, accCostPTp, ilNeg, ilNegCT, ilNegPT, ilNegPTp, ilNegMD, sc := net.AddPVLVOFCus(&ss.Context, ny, popY, popX, nuBgY, nuBgX, nuCtxY, nuCtxX, space)
 	// note: list all above so can copy / paste and validate correct return values
 	_, _, _, _, _, _ = vSgpi, vSmtxGo, vSmtxNo, vSpatchD1, vSpatchD2, urgency
 	_, _, _, _, _, _ = usPos, pvPos, usNeg, usNegP, pvNeg, pvNegP
 	_, _, _, _ = ilPos, ilPosCT, ilPosPTp, ilPosMD
 	_, _, _ = ofcNegUS, ofcNegUSCT, ofcNegUSPTp
 	_, _, _, _ = ilNeg, ilNegCT, ilNegPTp, ilNegMD
 	_, _, _ = accCost, accCostCT, accCostPTp
+	_, _, _, _, _ = ofcPosUSPT, ofcNegUSPT, ilPosPT, ilNegPT, accCostPT
 	// todo: connect more of above
 
 	time, timeP := net.AddInputPulv4D("Time", 1, cond.MaxTime, ny, 1, space)
@@ -224,20 +225,20 @@ func (ss *Sim) ConfigNet(net *axon.Network) {
 	net.ConnectToBLAExt(ctxIn, blaNegExt, full)
 
 	// OFCus predicts cs
-	net.ConnectToPFCBack(cs, csP, ofcPosUS, ofcPosUSCT, ofcPosUSPTp, full, "CSToPFC")
-	net.ConnectToPFCBack(cs, csP, ofcNegUS, ofcNegUSCT, ofcNegUSPTp, full, "CSToPFC")
+	net.ConnectToPFCBack(cs, csP, ofcPosUS, ofcPosUSCT, ofcPosUSPT, ofcPosUSPTp, full, "CSToPFC")
+	net.ConnectToPFCBack(cs, csP, ofcNegUS, ofcNegUSCT, ofcNegUSPT, ofcNegUSPTp, full, "CSToPFC")
 
 	///////////////////////////////////////////
 	// OFC predicts time, effort, urgency
 
 	// todo: a more dynamic US rep is needed to drive predictions in OFC
 
-	net.ConnectToPFCBack(time, timeP, ofcPosUS, ofcPosUSCT, ofcPosUSPTp, full, "TimeToPFC")
-	net.ConnectToPFCBack(time, timeP, ilPos, ilPosCT, ilPosPTp, full, "TimeToPFC")
+	net.ConnectToPFCBack(time, timeP, ofcPosUS, ofcPosUSCT, ofcPosUSPT, ofcPosUSPTp, full, "TimeToPFC")
+	net.ConnectToPFCBack(time, timeP, ilPos, ilPosCT, ilPosPT, ilPosPTp, full, "TimeToPFC")
 
-	net.ConnectToPFCBack(time, timeP, ofcNegUS, ofcNegUSCT, ofcNegUSPTp, full, "TimeToPFC")
-	net.ConnectToPFCBack(time, timeP, accCost, accCostCT, accCostPTp, full, "TimeToPFC")
-	net.ConnectToPFCBack(time, timeP, ilNeg, ilNegCT, ilNegPTp, full, "TimeToPFC")
+	net.ConnectToPFCBack(time, timeP, ofcNegUS, ofcNegUSCT, ofcNegUSPT, ofcNegUSPTp, full, "TimeToPFC")
+	net.ConnectToPFCBack(time, timeP, accCost, accCostCT, accCostPT, accCostPTp, full, "TimeToPFC")
+	net.ConnectToPFCBack(time, timeP, ilNeg, ilNegCT, ilNegPT, ilNegPTp, full, "TimeToPFC")
 
 	////////////////////////////////////////////////
 	// position