Merge pull request #245 from sanger/develop

Prepare new release of QuantHub
sanger · Jul 24, 2023 · 85c25cc · 85c25cc
2 parents 6233386 + 3caa4a2
commit 85c25cc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 26 deletions.
diff --git a/src/config/quantTypes.json b/src/config/quantTypes.json
@@ -1254,15 +1254,15 @@
       "units": "nM",
       "assay": {
         "type": "Heron TapeStation Tubes",
-        "version": "v2.0"
+        "version": "v3.0"
       },
       "barcodeSource": "id",
       "outlier": {
         "type": "cv",
         "threshold": 15
       },
       "warningThreshold": {
-        "value": 3.08642,
+        "value": 5,
         "shortMessage": "low conc",
         "message": "TapeStation may not be accurate at this low concentration"
       },
@@ -1276,17 +1276,6 @@
         "assay_version"
       ]
     },
-    "conversion": {
-      "factors": {
-        "mult": 1.62,
-        "min": 1.811240654,
-        "max": 55.58274833,
-        "n": -3.02450536,
-        "ec_50": 38.00059141
-      },
-      "expression": "(min+(max-min)/(1+10^(n*(log10(mult*ORIGINAL_VALUE)-log10(ec_50)))))",
-      "decimalPlaces": 3
-    },
     "grid": {
       "numberOfRows": 8,
       "numberOfColumns": 12

diff --git a/tests/e2e/fixtures/tapestationRequest.json b/tests/e2e/fixtures/tapestationRequest.json
@@ -6,56 +6,56 @@
         {
           "barcode": "NT1",
           "key": "molarity",
-          "value": 53.656,
+          "value": 69.667,
           "units": "nM",
           "cv": 84.364,
           "assay_type": "Heron TapeStation Tubes",
-          "assay_version": "v2.0"
+          "assay_version": "v3.0"
         },
         {
           "barcode": "NT3",
           "key": "molarity",
-          "value": 53.421,
+          "value": 66.967,
           "units": "nM",
           "cv": 4.89,
           "assay_type": "Heron TapeStation Tubes",
-          "assay_version": "v2.0"
+          "assay_version": "v3.0"
         },
         {
           "barcode": "NT5",
           "key": "molarity",
-          "value": 54.716,
+          "value": 91.35,
           "units": "nM",
           "cv": 52.094,
           "assay_type": "Heron TapeStation Tubes",
-          "assay_version": "v2.0"
+          "assay_version": "v3.0"
         },
         {
           "barcode": "NT6",
           "key": "molarity",
-          "value": 51.974,
+          "value": 56,
           "units": "nM",
           "cv": 19.301,
           "assay_type": "Heron TapeStation Tubes",
-          "assay_version": "v2.0"
+          "assay_version": "v3.0"
         },
         {
           "barcode": "NT4",
           "key": "molarity",
-          "value": 52.922,
+          "value": 62.325,
           "units": "nM",
           "cv": 17.251,
           "assay_type": "Heron TapeStation Tubes",
-          "assay_version": "v2.0"
+          "assay_version": "v3.0"
         },
         {
           "barcode": "NT2",
           "key": "molarity",
-          "value": 51.378,
+          "value": 53.033,
           "units": "nM",
           "cv": 14.279,
           "assay_type": "Heron TapeStation Tubes",
-          "assay_version": "v2.0"
+          "assay_version": "v3.0"
         }
       ]
     }

diff --git a/tests/unit/QuantType.spec.js b/tests/unit/QuantType.spec.js
@@ -617,7 +617,7 @@ describe('quantType', () => {
 
     it('must have the correct conversion expression', () => {
       expect(quantType.replicateOptions.conversionExpression).toEqual(
-        '(1.811240654+(55.58274833-1.811240654)/(1+10^(-3.02450536*(log10(1.62*ORIGINAL_VALUE)-log10(38.00059141)))))'
+        '(ORIGINAL_VALUE)'
       )
     })
   })