kaveh commited on
Commit
855dc38
·
1 Parent(s): 7ab411e

updated names based on Mari suggestion

Browse files
Files changed (1) hide show
  1. S2FApp/utils/substrate_settings.py +4 -4
S2FApp/utils/substrate_settings.py CHANGED
@@ -50,7 +50,7 @@ def resolve_substrate(name, config=None, config_path=None):
50
 
51
  s = (name or '').strip()
52
  if not s:
53
- return config.get('default_substrate', 'fibroblasts_PDMS')
54
 
55
  substrates = config.get('substrates', {})
56
  s_lower = s.lower()
@@ -61,7 +61,7 @@ def resolve_substrate(name, config=None, config_path=None):
61
  if s_lower.startswith(key.lower()) or key.lower().startswith(s_lower):
62
  return key
63
 
64
- return config.get('default_substrate', 'fibroblasts_PDMS')
65
 
66
 
67
  def get_settings_of_category(substrate_name, config=None, config_path=None):
@@ -81,12 +81,12 @@ def get_settings_of_category(substrate_name, config=None, config_path=None):
81
 
82
  substrate_key = resolve_substrate(substrate_name, config=config)
83
  substrates = config.get('substrates', {})
84
- default = config.get('default_substrate', 'fibroblasts_PDMS')
85
 
86
  if substrate_key in substrates:
87
  return substrates[substrate_key].copy()
88
 
89
- default_settings = substrates.get(default, {'name': 'Fibroblasts on PDMS', 'pixelsize': 3.0769, 'young': 6000})
90
  return default_settings.copy()
91
 
92
 
 
50
 
51
  s = (name or '').strip()
52
  if not s:
53
+ return config.get('default_substrate', 'Fibroblasts_Fibronectin_6KPa')
54
 
55
  substrates = config.get('substrates', {})
56
  s_lower = s.lower()
 
61
  if s_lower.startswith(key.lower()) or key.lower().startswith(s_lower):
62
  return key
63
 
64
+ return config.get('default_substrate', 'Fibroblasts_Fibronectin_6KPa')
65
 
66
 
67
  def get_settings_of_category(substrate_name, config=None, config_path=None):
 
81
 
82
  substrate_key = resolve_substrate(substrate_name, config=config)
83
  substrates = config.get('substrates', {})
84
+ default = config.get('default_substrate', 'Fibroblasts_Fibronectin_6KPa')
85
 
86
  if substrate_key in substrates:
87
  return substrates[substrate_key].copy()
88
 
89
+ default_settings = substrates.get(default, {'name': 'Fibroblasts on Fibronectin (6 kPa)', 'pixelsize': 3.0769, 'young': 6000})
90
  return default_settings.copy()
91
 
92