From 768420b67758e487f7749ef0972ddca86322cbd7 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Thu, 19 Nov 2020 23:18:52 +0100 Subject: [PATCH] Acceleration --- content/dataset.html | 3 +-- static/js/data.js | 2 +- static/js/loadAllData.js | 6 ++---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/content/dataset.html b/content/dataset.html index 4716fab5..6ffec757 100644 --- a/content/dataset.html +++ b/content/dataset.html @@ -111,8 +111,7 @@ draft: false const subset = sub.filter(d => d.set.isSameSet(exSet)) for (mol of uniq(subset.map(d => d.molecule))) { const submol = subset.filter(d => d.molecule === mol) - const source = await submol.findAsync(async (d) => { -// const source = submol.find((d) => { + const source = submol.find((d) => { if (db.sets.get(d.set.name)[d.set.index] === "10.1021/acs.jctc.8b01205") { return d.method.name === "CASPT2" && d.method.basis === "aug-cc-pVDZ" } else { diff --git a/static/js/data.js b/static/js/data.js index 7b1d9e6a..8e9148a6 100644 --- a/static/js/data.js +++ b/static/js/data.js @@ -281,7 +281,7 @@ class dataFileBase { file = getFullDataPath(file) // const maxAge= (DebugMode.Enabled,0,600) // var str = await getTextFromFileUrlAsync(file,{"Cache-Control":`max-age=${maxAge}`}) - var str = await getTextFromFileUrl(file) //TODO + var str = await getTextFromFileUrl(file) break; case File.name: var str = await getTextFromUploadedFileAsync(file) diff --git a/static/js/loadAllData.js b/static/js/loadAllData.js index 94158493..8515f1fa 100644 --- a/static/js/loadAllData.js +++ b/static/js/loadAllData.js @@ -4,12 +4,10 @@ async function loadAllData() { fluo: [], }; for (const f of getAbsFilesName()) { -// dic.abs.push(VertDataFile.load(f,VertExcitationKinds.Absorbtion)) - dic.abs.push(await VertDataFile.loadAsync(f,VertExcitationKinds.Absorbtion)) + dic.abs.push(VertDataFile.load(f,VertExcitationKinds.Absorbtion)) } for (const f of getFluoFilesName()) { -// dic.fluo.push(VertDataFile.load(f,VertExcitationKinds.Fluorescence)) - dic.fluo.push(await VertDataFile.loadAsync(f,VertExcitationKinds.Fluorescence)) + dic.fluo.push(VertDataFile.load(f,VertExcitationKinds.Fluorescence)) } return dic; }