Changeset 1975 for extensions/net.sf.basedb.reggie/trunk/resources/libprep/create_pools.jsp

Timestamp:

May 15, 2013, 1:20:50 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #485 and #479. Only use 1 decimal in lab protocols for pooling. Use the rounded values when calculating molarity and other values for the pool.

File:

• extensions/net.sf.basedb.reggie/trunk/resources/libprep/create_pools.jsp (modified) (4 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/libprep/create_pools.jsp

@@ -146 +146 @@
         tmp.volume = lib.volume;
         tmp.eb = lib.eb;
-        tmp.extraMixFactor = lib.extraMixFactor;
+        tmp.mixFactor = lib.mixFactor;
         poolInfo.libs[poolInfo.libs.length] = tmp;
       }
@@ -315 +315 @@
     }
 
-    if (lib.extraMixFactor)
+    if (lib.mixFactor > 1.001)
     {
       // Larger mix than default
-      var mixedVolume = (lib.volume+lib.eb)*(1+lib.extraMixFactor);
+      var mixedVolume = (lib.volume+lib.eb)*(lib.mixFactor);
       remarks[remarks.length] = 'Mix ' + Numbers.formatNumber(mixedVolume, 0) + 'µl';
     }
@@ -353 +353 @@
       if (lib)
       {
-        poolMolarity += Math.min(lib.molarity, TARGET_MOLARITY_IN_POOL);
+        poolMolarity += Math.min(lib.molarity, lib.mixMolarity);
         poolVolume += TARGET_VOLUME_IN_POOL_PER_LIB;
         numLibs++;
@@ -392 +392 @@
       var name = lib.name;
       var i = name.indexOf('.m');
-      var mixFactor = 1+lib.extraMixFactor;
+      var mixFactor = lib.mixFactor;
       var displayName = name.substring(0, i)+'.<br>&nbsp;'+name.substring(i);
       text += '<div class="lib">'+displayName+'</div>';
       text += '<span class="barcode">'+lib.barcode.name+'</span>';
       text += '<span class="molarity">'+Numbers.formatNumber(lib.molarity, 2)+'nM</span>';
-      text += '<span class="volume">'+Numbers.formatNumber(lib.volume*mixFactor, 2) + 'µl</span>';
-      text += '<span class="eb">'+Numbers.formatNumber(lib.eb*mixFactor, 2)+'µl</span>';
+      text += '<span class="volume">'+Numbers.formatNumber(lib.volume*mixFactor, 1) + 'µl</span>';
+      text += '<span class="eb">'+Numbers.formatNumber(lib.eb*mixFactor, 1)+'µl</span>';
       text += '<div class="remarks">'+ lib.remarks.join('; ') + '</div>';
     }