Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/libprep/create_pools.jsp

    r1972 r1975  
    146146        tmp.volume = lib.volume;
    147147        tmp.eb = lib.eb;
    148         tmp.extraMixFactor = lib.extraMixFactor;
     148        tmp.mixFactor = lib.mixFactor;
    149149        poolInfo.libs[poolInfo.libs.length] = tmp;
    150150      }
     
    315315    }
    316316
    317     if (lib.extraMixFactor)
     317    if (lib.mixFactor > 1.001)
    318318    {
    319319      // Larger mix than default
    320       var mixedVolume = (lib.volume+lib.eb)*(1+lib.extraMixFactor);
     320      var mixedVolume = (lib.volume+lib.eb)*(lib.mixFactor);
    321321      remarks[remarks.length] = 'Mix ' + Numbers.formatNumber(mixedVolume, 0) + 'µl';
    322322    }
     
    353353      if (lib)
    354354      {
    355         poolMolarity += Math.min(lib.molarity, TARGET_MOLARITY_IN_POOL);
     355        poolMolarity += Math.min(lib.molarity, lib.mixMolarity);
    356356        poolVolume += TARGET_VOLUME_IN_POOL_PER_LIB;
    357357        numLibs++;
     
    392392      var name = lib.name;
    393393      var i = name.indexOf('.m');
    394       var mixFactor = 1+lib.extraMixFactor;
     394      var mixFactor = lib.mixFactor;
    395395      var displayName = name.substring(0, i)+'.<br>&nbsp;'+name.substring(i);
    396396      text += '<div class="lib">'+displayName+'</div>';
    397397      text += '<span class="barcode">'+lib.barcode.name+'</span>';
    398398      text += '<span class="molarity">'+Numbers.formatNumber(lib.molarity, 2)+'nM</span>';
    399       text += '<span class="volume">'+Numbers.formatNumber(lib.volume*mixFactor, 2) + 'µl</span>';
    400       text += '<span class="eb">'+Numbers.formatNumber(lib.eb*mixFactor, 2)+'µl</span>';
     399      text += '<span class="volume">'+Numbers.formatNumber(lib.volume*mixFactor, 1) + 'µl</span>';
     400      text += '<span class="eb">'+Numbers.formatNumber(lib.eb*mixFactor, 1)+'µl</span>';
    401401      text += '<div class="remarks">'+ lib.remarks.join('; ') + '</div>';
    402402    }
Note: See TracChangeset for help on using the changeset viewer.