Change cow to cattle

mlin865 · Nov 16, 2020 · be17b38 · be17b38
1 parent a0bab27
commit be17b38
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/scaffoldmaker/meshtypes/meshtype_3d_colon1.py b/src/scaffoldmaker/meshtypes/meshtype_3d_colon1.py
@@ -27,7 +27,7 @@ class MeshType_3d_colon1(Scaffold_base):
     '''
 
     centralPathDefaultScaffoldPackages = {
-        'Cow 1' : ScaffoldPackage(MeshType_1d_path1, {
+        'Cattle 1' : ScaffoldPackage(MeshType_1d_path1, {
             'scaffoldSettings' : {
                 'Coordinate dimensions' : 3,
                 'D2 derivatives': True,
@@ -235,7 +235,7 @@ def getName():
     def getParameterSetNames():
         return [
             'Default',
-            'Cow 1',
+            'Cattle 1',
             'Human 1',
             'Human 2',
             'Mouse 1',
@@ -247,8 +247,8 @@ def getParameterSetNames():
     def getDefaultOptions(cls, parameterSetName='Default'):
         if 'Human 2' in parameterSetName:
             centralPathOption = cls.centralPathDefaultScaffoldPackages['Human 2']
-        elif 'Cow 1' in parameterSetName:
-            centralPathOption = cls.centralPathDefaultScaffoldPackages['Cow 1']
+        elif 'Cattle 1' in parameterSetName:
+            centralPathOption = cls.centralPathDefaultScaffoldPackages['Cattle 1']
         elif 'Mouse 1' in parameterSetName:
             centralPathOption = cls.centralPathDefaultScaffoldPackages['Mouse 1']
         elif 'Mouse 2' in parameterSetName:
@@ -259,8 +259,8 @@ def getDefaultOptions(cls, parameterSetName='Default'):
             centralPathOption = cls.centralPathDefaultScaffoldPackages['Pig 2']
         else:
             centralPathOption = cls.centralPathDefaultScaffoldPackages['Human 1']
-        if 'Cow' in parameterSetName:
-            segmentProfileOption = ScaffoldPackage(MeshType_3d_colonsegment1, defaultParameterSetName = 'Cow 1')
+        if 'Cattle' in parameterSetName:
+            segmentProfileOption = ScaffoldPackage(MeshType_3d_colonsegment1, defaultParameterSetName = 'Cattle 1')
         elif 'Mouse' in parameterSetName:
             segmentProfileOption = ScaffoldPackage(MeshType_3d_colonsegment1, defaultParameterSetName = 'Mouse 1')
         elif 'Pig' in parameterSetName:
@@ -288,7 +288,7 @@ def getDefaultOptions(cls, parameterSetName='Default'):
             'Refine number of elements along' : 1,
             'Refine number of elements through wall' : 1
             }
-        if 'Cow 1' in parameterSetName:
+        if 'Cattle 1' in parameterSetName:
             options['Number of segments'] = 40
             options['Proximal length'] = 880.0
             options['Transverse length'] = 3500.0

diff --git a/src/scaffoldmaker/meshtypes/meshtype_3d_colonsegment1.py b/src/scaffoldmaker/meshtypes/meshtype_3d_colonsegment1.py
@@ -43,7 +43,7 @@ def getName():
     def getParameterSetNames():
         return [
             'Default',
-            'Cow 1',
+            'Cattle 1',
             'Human 1',
             'Mouse 1',
             'Pig 1']
@@ -79,7 +79,7 @@ def getDefaultOptions(parameterSetName='Default'):
             'Refine number of elements along segment' : 1,
             'Refine number of elements through wall' : 1
         }
-        if 'Cow' in parameterSetName:
+        if 'Cattle' in parameterSetName:
             options['Start inner radius'] = 10.5
             options['End inner radius'] = 10.5
             options['Corner inner radius factor'] = 0.0