fix/substanceState: Add "WholeBlood" to cmd_bio subGenerator

GenData did not have a case for Classification = WholeBlood, so subs with this classification were not correctly parsed. Change "State" of antigens to "Molecular" because previous value of "Cellular" did not exist on schema.
BioGearsEngine · Apr 30, 2020 · 10817ee · 10817ee
1 parent 6d97dfb
commit 10817ee
Show file tree

Hide file tree

Showing 36 changed files with 112 additions and 128 deletions.
diff --git a/projects/cmd_bio/src/data/SubstanceGenerator.cpp b/projects/cmd_bio/src/data/SubstanceGenerator.cpp
@@ -128,7 +128,7 @@ bool SubstanceGenerator::process(const std::string& name, const std::string& val
       substance.State(SubstanceData::State_type::Gas);
     } else if ("Molecular" == value) {
       substance.State(SubstanceData::State_type::Molecular);
-    } else {
+    }  else {
       rValue = false;
     }
   } else if ("Classification" == name) {
@@ -144,7 +144,10 @@ bool SubstanceGenerator::process(const std::string& name, const std::string& val
       substance.Classification(SubstanceData::Classification_type::ReversalAgent);
     } else if ("Sedative" == value) {
       substance.Classification(SubstanceData::Classification_type::Sedative);
-    } else if ("" == value) {
+    } else if ("WholeBlood" == value) {
+      substance.Classification(SubstanceData::Classification_type::WholeBlood);
+    } 
+    else if ("" == value) {
       //Classification is Optional and need not be set
     } else {
       rValue = false;

diff --git a/share/data/BioGears.xlsx b/share/data/BioGears.xlsx
diff --git a/share/data/Substances.csv b/share/data/Substances.csv
@@ -1,6 +1,6 @@
 Name,CarbonDioxide,CarbonMonoxide, Nitrogen,Oxygen,Bicarbonate,Calcium,Chloride,Potassium,Sodium,Epinephrine,Glucagon,Insulin,AminoAcids,Creatinine,Glucose,Ketones,Lactate,Triacylglycerol,Urea,Acetaminophen,Albuterol, Desflurane,Ertapenem, Fentanyl,Furosemide, Ketamine, Midazolam, Morphine,Moxifloxacin, Naloxone,Norepinephrine,Piperacillin,Pralidoxime,Prednisone, Propofol,Rocuronium,Sarin, Succinylcholine,Tazobactam,TranexamicAcid,Vasopressin,Albumin,Globulin,Hemoglobin,Oxyhemoglobin ,Carboxyhemoglobin ,Carbaminohemoglobin  ,OxyCarbaminohemoglobin  ,ForestFireParticulate,Antigen_A,Antigen_B,Platelet,RedBloodCell,WhiteBloodCell
 Substance (State req'd others optional),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-State,Gas,Gas,Gas,Gas,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Solid,Liquid,Gas,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Molecular,Molecular,Molecular,Molecular,Molecular,Solid,Cellular,Cellular,Cellular,Cellular,Cellular
+State,Gas,Gas,Gas,Gas,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Solid,Liquid,Gas,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Liquid,Molecular,Molecular,Molecular,Molecular,Molecular,Solid,Molecular,Molecular,Molecular,Molecular,Molecular
 Classification,,,,,,Ion,Ion,Ion,Ion,,,,,,,,,,,,,Anesthetic,Antibiotic,Opioid,,Anesthetic,Sedative,Opioid,Antibiotic,ReversalAgent,,Antibiotic,ReversalAgent,,Anesthetic,Anesthetic,,Anesthetic,Antibiotic,,,,,,,,,,,WholeBlood,WholeBlood,WholeBlood,WholeBlood,WholeBlood
 Density,1842.12 g/m^3,1165 g/m^3,1251 g/m^3,1429 g/m^3,,,,,,,,,,,,,,875.2 kg/m^3,,1.293 g/cm^3,3213 g/m^3,6610 g/m^3,,,,,,,,,,,,,,,1100 kg/m^3,,,,,,,,,,,,,,,1.06 g/mL,1.1 g/mL,1.08 g/mL
 MaximumDiffusionFlux,,,,,,,,,,,,,,,1 g/cm^2 s,0.5 g/cm^2 s,,0.5 g/cm^2 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

diff --git a/share/data/substances/Acetaminophen.xml b/share/data/substances/Acetaminophen.xml
@@ -1,55 +1,54 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Substance xmlns="uri:/mil/tatrc/physiology/datamodel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" contentVersion="BioGears_6.1.1-beta" xsi:schemaLocation="">
-    <Name>Acetaminophen</Name>
-    <Density readOnly="false" unit="g/cm^3" value="1.293"/>
-    <MolarMass value="151.163" unit="g/mol"/>
-    <State>Solid</State>
-    <Clearance>
-        <Systemic>
-            <FractionExcretedInFeces value="0.0"/>
-            <FractionUnboundInPlasma value="0.9"/>
-            <IntrinsicClearance value="0.5" unit="mL/min kg"/>
-            <RenalClearance value="4.5" unit="mL/min kg"/>
-            <SystemicClearance value="0.5" unit="mL/min kg"/>
-        </Systemic>
-        <RenalDynamics>
-          <Clearance readOnly="false" unit="mL/min kg" value="4.5"/>
-        </RenalDynamics>
-    </Clearance>
-	<Pharmacokinetics>
-      <Physicochemicals>
-        <AcidDissociationConstant readOnly="false" value="9.78"/>
-        <BindingProtein>Albumin</BindingProtein>
-        <BloodPlasmaRatio readOnly="false" value="1.05"/>
-        <FractionUnboundInPlasma readOnly="false" value="0.9"/>
-        <IonicState>Acid</IonicState>
-        <LogP readOnly="false" value="0.46"/>
-        <HydrogenBondCount readOnly="false" value="4"/>
-        <PolarSurfaceArea readOnly="false" value="49.3"/>
-      </Physicochemicals>
-    </Pharmacokinetics>
-    <Pharmacodynamics>
-      <Bronchodilation readOnly="false" value="0"/>
-      <DiastolicPressureModifier readOnly="false" value="0.0"/>
-      <EC50 readOnly="false" unit="ug/mL" value="5.17"/>
-      <EMaxShapeParameter readOnly="false" value="9.98"/>
-	  <FeverModifier readOnly="false" value="0.1"/>
-      <HeartRateModifier readOnly="false" value="0.0"/>
-      <HemorrhageModifier readOnly="false" value="0"/>
-      <NeuromuscularBlock readOnly="false" value="0"/>
-	  <PainModifier readOnly="false" value="0.05"/>
-      <PupillaryResponse>
-        <ReactivityModifier readOnly="false" value="0.0"/>
-        <SizeModifier readOnly="false" value="0.0"/>
-      </PupillaryResponse>
-      <RespirationRateModifier readOnly="false" value="0.0"/>
-      <Sedation readOnly="false" value="0"/>
-      <SystolicPressureModifier readOnly="false" value="0.0"/>
-      <TidalVolumeModifier readOnly="false" value="0"/>
-      <TubularPermeabilityModifier readOnly="false" value="0"/>
-      <CentralNervousModifier readOnly="false" value="0"/>
-      <AntibacterialEffect readOnly="false" unit="1/hr" value="0"/>
-      <EffectSiteRateConstant readOnly="false" unit="1/min" value="0.0"/>
-    </Pharmacodynamics>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Substance xmlns="uri:/mil/tatrc/physiology/datamodel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="uri:/mil/tatrc/physiology/datamodel BioGears.xsd">
+  <Name>Acetaminophen</Name>
+  <Density readOnly="false" unit="g/cm^3" value="1.293"/>
+  <MolarMass readOnly="false" unit="g/mol" value="151.163"/>
+  <State>Solid</State>
+  <Clearance>
+    <Systemic>
+      <FractionExcretedInFeces readOnly="false" value="0"/>
+      <FractionUnboundInPlasma readOnly="false" value="0.9"/>
+      <IntrinsicClearance readOnly="false" unit="mL/min kg" value="0.5"/>
+      <RenalClearance readOnly="false" unit="mL/min kg" value="4.5"/>
+      <SystemicClearance readOnly="false" unit="mL/min kg" value="0.5"/>
+    </Systemic>
+    <RenalDynamics>
+      <Clearance readOnly="false" unit="mL/min kg" value="4.5"/>
+    </RenalDynamics>
+  </Clearance>
+  <Pharmacokinetics>
+    <Physicochemicals>
+      <AcidDissociationConstant readOnly="false" value="9.78"/>
+      <BindingProtein>Albumin</BindingProtein>
+      <BloodPlasmaRatio readOnly="false" value="1.05"/>
+      <FractionUnboundInPlasma readOnly="false" value="0.9"/>
+      <IonicState>Acid</IonicState>
+      <LogP readOnly="false" value="0.46"/>
+      <HydrogenBondCount readOnly="false" value="4"/>
+      <PolarSurfaceArea readOnly="false" value="49.3"/>
+    </Physicochemicals>
+  </Pharmacokinetics>
+  <Pharmacodynamics>
+    <Bronchodilation readOnly="false" value="0"/>
+    <DiastolicPressureModifier readOnly="false" value="0"/>
+    <EC50 readOnly="false" unit="" value="5.17"/>
+    <EMaxShapeParameter readOnly="false" value="9.98"/>
+    <FeverModifier readOnly="false" value="0.1"/>
+    <HeartRateModifier readOnly="false" value="0"/>
+    <HemorrhageModifier readOnly="false" value="0"/>
+    <NeuromuscularBlock readOnly="false" value="0"/>
+    <PainModifier readOnly="false" value="0.05"/>
+    <PupillaryResponse>
+      <ReactivityModifier readOnly="false" value="0"/>
+      <SizeModifier readOnly="false" value="0"/>
+    </PupillaryResponse>
+    <RespirationRateModifier readOnly="false" value="0"/>
+    <Sedation readOnly="false" value="0"/>
+    <SystolicPressureModifier readOnly="false" value="0"/>
+    <TidalVolumeModifier readOnly="false" value="0"/>
+    <TubularPermeabilityModifier readOnly="false" value="0"/>
+    <CentralNervousModifier readOnly="false" value="0"/>
+    <AntibacterialEffect readOnly="false" unit="1/hr" value="0"/>
+    <EffectSiteRateConstant readOnly="false" unit="1/min" value="0"/>
+  </Pharmacodynamics>
 </Substance>
-
diff --git a/share/data/substances/Albuterol.xml b/share/data/substances/Albuterol.xml
@@ -89,11 +89,11 @@
     <DiastolicPressureModifier readOnly="false" value="0"/>
     <EC50 readOnly="false" unit="ug/mL" value="3.1e-05"/>
     <EMaxShapeParameter readOnly="false" value="1"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="0.3"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0"/>
+    <PainModifier readOnly="false" value="0"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="-0.5"/>
       <SizeModifier readOnly="false" value="0.5"/>

diff --git a/share/data/substances/Antigen_A.xml b/share/data/substances/Antigen_A.xml
@@ -3,6 +3,7 @@
   <Name>Antigen_A</Name>
   <Classification>WholeBlood</Classification>
   <MolarMass readOnly="false" unit="g/mol" value="1212.013"/>
+  <State>Molecular</State>
   <Antigen>A</Antigen>
   <Clearance>
     <CellRegulation>

diff --git a/share/data/substances/Antigen_B.xml b/share/data/substances/Antigen_B.xml
@@ -3,6 +3,7 @@
   <Name>Antigen_B</Name>
   <Classification>WholeBlood</Classification>
   <MolarMass readOnly="false" unit="g/mol" value="991.972"/>
+  <State>Molecular</State>
   <Antigen>B</Antigen>
   <Clearance>
     <CellRegulation>

diff --git a/share/data/substances/Blood_ANegative.xml b/share/data/substances/Blood_ANegative.xml
@@ -49,7 +49,7 @@
     <Concentration readOnly="false" unit="g/L" value="0.023"/>
   </Component>
   <Component Name="Antigen_B">
-    <Concentration readOnly="false" unit="g/L" value="0"/>
+    <Concentration readOnly="false" unit="g/dL" value="0"/>
   </Component>
   <Component Name="WhiteBloodCell">
     <Concentration readOnly="false" unit="g/dL" value="0.0189"/>

diff --git a/share/data/substances/Blood_APositive.xml b/share/data/substances/Blood_APositive.xml
@@ -49,7 +49,7 @@
     <Concentration readOnly="false" unit="g/L" value="0.023"/>
   </Component>
   <Component Name="Antigen_B">
-    <Concentration readOnly="false" unit="g/L" value="0"/>
+    <Concentration readOnly="false" unit="g/dL" value="0"/>
   </Component>
   <Component Name="WhiteBloodCell">
     <Concentration readOnly="false" unit="g/dL" value="0.0189"/>

diff --git a/share/data/substances/Blood_BNegative.xml b/share/data/substances/Blood_BNegative.xml
@@ -46,7 +46,7 @@
     <Concentration readOnly="false" unit="g/dL" value="14.256"/>
   </Component>
   <Component Name="Antigen_A">
-    <Concentration readOnly="false" unit="g/L" value="0"/>
+    <Concentration readOnly="false" unit="g/dL" value="0"/>
   </Component>
   <Component Name="Antigen_B">
     <Concentration readOnly="false" unit="g/L" value="0.019"/>

diff --git a/share/data/substances/Blood_BPositive.xml b/share/data/substances/Blood_BPositive.xml
@@ -46,7 +46,7 @@
     <Concentration readOnly="false" unit="g/dL" value="14.256"/>
   </Component>
   <Component Name="Antigen_A">
-    <Concentration readOnly="false" unit="g/L" value="0"/>
+    <Concentration readOnly="false" unit="g/dL" value="0"/>
   </Component>
   <Component Name="Antigen_B">
     <Concentration readOnly="false" unit="g/L" value="0.019"/>

diff --git a/share/data/substances/Calcium.xml b/share/data/substances/Calcium.xml
@@ -17,9 +17,9 @@
       <Regulation>
         <ChargeInBlood>Positive</ChargeInBlood>
         <FractionUnboundInPlasma readOnly="false" value="1"/>
-        <ReabsorptionRatio readOnly="false" value="0.8"/>
+        <ReabsorptionRatio readOnly="false" value="1.8"/>
         <TransportMaximum readOnly="false" unit="mg/min" value="INF"/>
       </Regulation>
     </RenalDynamics>
   </Clearance>
-</Substance>
+</Substance>
diff --git a/share/data/substances/Chloride.xml b/share/data/substances/Chloride.xml
@@ -10,7 +10,7 @@
       <Regulation>
         <ChargeInBlood>Negative</ChargeInBlood>
         <FractionUnboundInPlasma readOnly="false" value="1"/>
-        <ReabsorptionRatio readOnly="false" value="0.9"/>
+        <ReabsorptionRatio readOnly="false" value="1.4"/>
         <TransportMaximum readOnly="false" unit="mg/min" value="INF"/>
       </Regulation>
     </RenalDynamics>

diff --git a/share/data/substances/Desflurane.xml b/share/data/substances/Desflurane.xml
@@ -36,11 +36,11 @@
     <DiastolicPressureModifier readOnly="false" value="-0.45"/>
     <EC50 readOnly="false" unit="ug/mL" value="100"/>
     <EMaxShapeParameter readOnly="false" value="10"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="0.4"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0"/>
+    <PainModifier readOnly="false" value="0"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="0"/>
       <SizeModifier readOnly="false" value="0"/>

diff --git a/share/data/substances/Epinephrine.xml b/share/data/substances/Epinephrine.xml
@@ -27,27 +27,4 @@
       <PolarSurfaceArea readOnly="false" value="0"/>
     </Physicochemicals>
   </Pharmacokinetics>
-  <Pharmacodynamics>
-    <Bronchodilation readOnly="false" value="0.3"/>
-    <DiastolicPressureModifier readOnly="false" value="-0.25"/>
-    <EC50 readOnly="false" unit="ug/mL" value="0.0009"/>
-    <EMaxShapeParameter readOnly="false" value="10"/>
-	<FeverModifier readOnly="false" value="0"/>
-    <HeartRateModifier readOnly="false" value="0.45"/>
-    <HemorrhageModifier readOnly="false" value="0"/>
-    <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0"/>
-    <PupillaryResponse>
-      <ReactivityModifier readOnly="false" value="0"/>
-      <SizeModifier readOnly="false" value="0.34"/>
-    </PupillaryResponse>
-    <RespirationRateModifier readOnly="false" value="0"/>
-    <Sedation readOnly="false" value="0"/>
-    <SystolicPressureModifier readOnly="false" value="0.5"/>
-    <TidalVolumeModifier readOnly="false" value="0"/>
-    <TubularPermeabilityModifier readOnly="false" value="0"/>
-    <CentralNervousModifier readOnly="false" value="0"/>
-    <AntibacterialEffect readOnly="false" unit="1/hr" value="0"/>
-    <EffectSiteRateConstant readOnly="false" unit="1/min" value="0"/>
-  </Pharmacodynamics>
 </Substance>
diff --git a/share/data/substances/Ertapenem.xml b/share/data/substances/Ertapenem.xml
@@ -33,11 +33,11 @@
     <DiastolicPressureModifier readOnly="false" value="0"/>
     <EC50 readOnly="false" unit="mg/L" value="0.029"/>
     <EMaxShapeParameter readOnly="false" value="1"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="0"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0"/>
+    <PainModifier readOnly="false" value="0"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="0"/>
       <SizeModifier readOnly="false" value="0"/>

diff --git a/share/data/substances/Fentanyl.xml b/share/data/substances/Fentanyl.xml
@@ -33,11 +33,11 @@
     <DiastolicPressureModifier readOnly="false" value="-0.05"/>
     <EC50 readOnly="false" unit="ug/mL" value="0.004"/>
     <EMaxShapeParameter readOnly="false" value="3"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="-0.01"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="1"/>
+    <PainModifier readOnly="false" value="1"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="-0.5"/>
       <SizeModifier readOnly="false" value="-0.33"/>

diff --git a/share/data/substances/Furosemide.xml b/share/data/substances/Furosemide.xml
@@ -32,11 +32,11 @@
     <DiastolicPressureModifier readOnly="false" value="0"/>
     <EC50 readOnly="false" unit="ug/mL" value="0.4462"/>
     <EMaxShapeParameter readOnly="false" value="1"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="0"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0"/>
+    <PainModifier readOnly="false" value="0"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="0"/>
       <SizeModifier readOnly="false" value="0"/>

diff --git a/share/data/substances/Ketamine.xml b/share/data/substances/Ketamine.xml
@@ -30,14 +30,14 @@
   </Pharmacokinetics>
   <Pharmacodynamics>
     <Bronchodilation readOnly="false" value="1"/>
-    <DiastolicPressureModifier readOnly="false" value="0.0"/>
+    <DiastolicPressureModifier readOnly="false" value="0"/>
     <EC50 readOnly="false" unit="ug/mL" value="0.4319"/>
     <EMaxShapeParameter readOnly="false" value="1"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="0.2"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0.75"/>
+    <PainModifier readOnly="false" value="0.75"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="-0.5"/>
       <SizeModifier readOnly="false" value="0"/>

diff --git a/share/data/substances/Midazolam.xml b/share/data/substances/Midazolam.xml
@@ -33,11 +33,11 @@
     <DiastolicPressureModifier readOnly="false" value="-0.25"/>
     <EC50 readOnly="false" unit="ug/mL" value="0.0558"/>
     <EMaxShapeParameter readOnly="false" value="1"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="0.3"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0"/>
+    <PainModifier readOnly="false" value="0"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="-0.5"/>
       <SizeModifier readOnly="false" value="0"/>

diff --git a/share/data/substances/Morphine.xml b/share/data/substances/Morphine.xml
@@ -75,11 +75,11 @@
     <DiastolicPressureModifier readOnly="false" value="-0.15"/>
     <EC50 readOnly="false" unit="ug/mL" value="0.075"/>
     <EMaxShapeParameter readOnly="false" value="1"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="-0.06"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0.85"/>
+    <PainModifier readOnly="false" value="0.85"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="0"/>
       <SizeModifier readOnly="false" value="-0.25"/>

diff --git a/share/data/substances/Moxifloxacin.xml b/share/data/substances/Moxifloxacin.xml
@@ -39,11 +39,11 @@
     <DiastolicPressureModifier readOnly="false" value="0"/>
     <EC50 readOnly="false" unit="mg/L" value="0.1"/>
     <EMaxShapeParameter readOnly="false" value="1"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="0"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0"/>
+    <PainModifier readOnly="false" value="0"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="0"/>
       <SizeModifier readOnly="false" value="0"/>

diff --git a/share/data/substances/Naloxone.xml b/share/data/substances/Naloxone.xml
@@ -33,11 +33,11 @@
     <DiastolicPressureModifier readOnly="false" value="0"/>
     <EC50 readOnly="false" unit="ug/mL" value="0.0015"/>
     <EMaxShapeParameter readOnly="false" value="1"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="0"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0"/>
+    <PainModifier readOnly="false" value="0"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="0"/>
       <SizeModifier readOnly="false" value="0"/>

diff --git a/share/data/substances/Norepinephrine.xml b/share/data/substances/Norepinephrine.xml
@@ -32,11 +32,11 @@
     <DiastolicPressureModifier readOnly="false" value="0.45"/>
     <EC50 readOnly="false" unit="ug/mL" value="0.008"/>
     <EMaxShapeParameter readOnly="false" value="1.8"/>
-	<FeverModifier readOnly="false" value="0"/>
+    <FeverModifier readOnly="false" value="0"/>
     <HeartRateModifier readOnly="false" value="0"/>
     <HemorrhageModifier readOnly="false" value="0"/>
     <NeuromuscularBlock readOnly="false" value="0"/>
-	<PainModifier readOnly="false" value="0"/>
+    <PainModifier readOnly="false" value="0"/>
     <PupillaryResponse>
       <ReactivityModifier readOnly="false" value="0"/>
       <SizeModifier readOnly="false" value="0"/>