Final work on Analyze

RDML-consortium · Jan 24, 2024 · f148445 · f148445
1 parent 47f28db
commit f148445
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 9 deletions.
diff --git a/client/src/static/bin/absolute.rdml b/client/src/static/bin/absolute.rdml
diff --git a/client/src/static/bin/linregpcr.rdml b/client/src/static/bin/linregpcr.rdml
diff --git a/client/src/static/bin/meltingcurveanalysis.rdml b/client/src/static/bin/meltingcurveanalysis.rdml
diff --git a/client/src/static/bin/merge.rdml b/client/src/static/bin/merge.rdml
diff --git a/client/src/static/bin/merge_add.rdml b/client/src/static/bin/merge_add.rdml
diff --git a/client/src/static/bin/sample.rdml b/client/src/static/bin/sample.rdml
diff --git a/client/src/static/js/rdml_analyze.js b/client/src/static/js/rdml_analyze.js
@@ -1874,18 +1874,24 @@ function updateClientData() {
                                         if (window.absoluteNcopyUnit  != "") {
                                             ret += '</td>\n<td style="text-align: right;">'
                                             csv += '\t'
-                                            if ((reacts[reac].datas[dataPos].hasOwnProperty("corrN0")) &&
-                                                (parseFloat(reacts[reac].datas[dataPos].corrN0) > 0.0) &&
+                                            if ((reacts[reac].datas[dataPos].hasOwnProperty("corrNcopy")) &&
+                                                (parseFloat(reacts[reac].datas[dataPos].corrNcopy) > 0.0) &&
                                                 (window.absoluteNcopyCorr.hasOwnProperty(reacts[reac].datas[dataPos].tar)) &&
                                                 (parseFloat(window.absoluteNcopyCorr[reacts[reac].datas[dataPos].tar]) > 0.0)) {
-                                                var fN0 = parseFloat(reacts[reac].datas[dataPos].corrN0)
-                                                var cN0 = parseFloat(window.absoluteNcopyCorr[reacts[reac].datas[dataPos].tar]);
+                                                var fNcopy = parseFloat(reacts[reac].datas[dataPos].corrNcopy);
+                                                var fvol = 20.0;
+                                                if ((reacts[reac].hasOwnProperty("vol")) &&
+                                                    (parseFloat(reacts[reac].vol) > 0.0)) {
+                                                    fvol = parseFloat(reacts[reac].vol)
+                                                }
+                                                var cNcopy = parseFloat(window.absoluteNcopyCorr[reacts[reac].datas[dataPos].tar]);
+                                                var finalQuant = fNcopy * cNcopy * fvol / 20.0
                                                 if (window.absoluteNcopyUnit == "cop") {
-                                                    ret += floatWithFixPrec(fN0 / cN0, 2)
-                                                    csv += floatWithFixPrec(fN0 / cN0, 2)
+                                                    ret += floatWithFixPrec(finalQuant, 2)
+                                                    csv += floatWithFixPrec(finalQuant, 2)
                                                 } else {
-                                                    ret += floatWithExPrec(fN0 / cN0, 2)
-                                                    csv += floatWithExPrec(fN0 / cN0, 2)
+                                                    ret += floatWithExPrec(finalQuant, 2)
+                                                    csv += floatWithExPrec(finalQuant, 2)
                                                 }
                                             }
                                         }

diff --git a/server/absolute.rdml b/server/absolute.rdml
diff --git a/server/linregpcr.rdml b/server/linregpcr.rdml
diff --git a/server/meltingcurveanalysis.rdml b/server/meltingcurveanalysis.rdml
diff --git a/server/merge.rdml b/server/merge.rdml
diff --git a/server/merge_add.rdml b/server/merge_add.rdml
diff --git a/server/rdmlpython b/server/rdmlpython
diff --git a/server/sample.rdml b/server/sample.rdml