Skip to content

Commit 91db7cc

Browse files
remove O1->I1 6k transition
1 parent bfd7fde commit 91db7cc

1 file changed

Lines changed: 17 additions & 14 deletions

File tree

‎pyrho/models.py‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -849,20 +849,23 @@ class RhO_6Kstates(RhodopsinModel):
849849
paramsList = ['g0', 'gam', 'phi_m', 'k1', 'k2', 'p',
850850
'Gf0', 'k_f', 'q', 'Go1', 'Go2',
851851
'Ga3', 'Gd1', 'Gd2', 'Gb', 'E', 'v0', 'v1'] # List of model constants
852-
853-
# connect = [[0, 0, 1, 1, 0, 1], # s_1 --> s_i=1...6
854-
# [1, 0, 1, 0, 0, 0], # s_2 -->
855-
# [0, 1, 0, 0, 0, 0],
856-
# [0, 0, 0, 0, 1, 0],
857-
# [0, 0, 0, 0, 0, 1],
858-
# [1, 0, 0, 1, 0, 0]]
859-
860-
connect = [[0, 1, 0, 0, 0, 1], # s_1 --> s_i=1...6
861-
[0, 0, 1, 0, 0, 0], # s_2 -->
862-
[1, 1, 0, 0, 0, 0],
863-
[1, 0, 0, 0, 0, 1],
864-
[0, 0, 0, 1, 0, 0],
865-
[1, 0, 0, 0, 1, 0]]
852+
# Assuming Gb is constant (not flux-dependent) Gb0 and k_b not needed
853+
854+
# With the O1-> I1 transition
855+
# connect = [[0, 1, 0, 0, 0, 1], # s_1 --> s_i=1...6
856+
# [0, 0, 1, 0, 0, 0], # s_2 -->
857+
# [1, 1, 0, 0, 0, 0],
858+
# [1, 0, 0, 0, 0, 1],
859+
# [0, 0, 0, 1, 0, 0],
860+
# [1, 0, 0, 0, 1, 0]]
861+
862+
# Withouth O1->I1 transition
863+
connect = [[0, 1, 0, 0, 0, 1], # C1 -> I1, C2
864+
[0, 0, 1, 0, 0, 0], # I1 -> O1
865+
[1, 0, 0, 0, 0, 0], # O1 -> C1
866+
[1, 0, 0, 0, 0, 1], # O2 -> C1, C2
867+
[0, 0, 0, 1, 0, 0], # I2 -> O2
868+
[1, 0, 0, 0, 1, 0]] # C2 -> C1, I2
866869

867870
equations = r"""
868871
$$ \dot{C_1} = G_{d1}O_1 + G_{b}C_2 + G_{a3}O_2 - G_{a1}(\phi)C_1 - G_{f}(\phi)C_1 $$

0 commit comments

Comments
 (0)