Skip to content

Commit

Permalink
Merge pull request #1 from jgruselius/master
Browse files Browse the repository at this point in the history 
Various updates to master since May
  • Loading branch information
@jgruselius
jgruselius committed Oct 14, 2014
2 parents 322cd78 + 54479b1 commit 23c6531
Show file tree
Hide file tree
Showing 55 changed files with 26,745 additions and 15,149 deletions.
676 changes: 338 additions & 338 deletions Protocol Files/development/jgr/ampure-xp.VWForm
View file

Large diffs are not rendered by default.

459 changes: 459 additions & 0 deletions Protocol Files/development/jgr/covaris_transfer.pro
View file

Large diffs are not rendered by default.

1,322 changes: 635 additions & 687 deletions Protocol Files/development/jgr/general_transfer.pro
View file

Large diffs are not rendered by default.

2,449 changes: 1,179 additions & 1,270 deletions Protocol Files/development/jgr/make_quant_plate-384.pro
View file

Large diffs are not rendered by default.

53 changes: 27 additions & 26 deletions Protocol Files/development/jgr/nextera/nextera_capture_elute.pro
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='ASCII' ?>
<Velocity11 file='Protocol_Data' md5sum='369aa38931ea94f64a017907924d359b' version='2.0' >
<Velocity11 file='Protocol_Data' md5sum='3feb282f3baf17c1994cdd1e39dbb57f' version='2.0' >
<File_Info AllowSimultaneousRun='1' AutoExportGanttChart='0' AutoLoadRacks='When the main protocol starts' AutoUnloadRacks='0' AutomaticallyLoadFormFile='1' Barcodes_Directory='' DeleteHitpickFiles='1' Description='' Device_File='C:\VWorks Workspace\Device Files\BravoMiniPHBenchCel_round_magnet_deepwell6.dev' DynamicAssignPlateStorageLoad='0' FinishScript='' Form_File='' HandlePlatesInInstance='1' Notes='' PipettePlatesInInstanceOrder='1' Protocol_Alias='' StartScript='' Use_Global_JS_Context='0' />
<Processes >
<Startup_Processes >
Expand Down Expand Up @@ -759,7 +759,7 @@ var aspirateSteps = Math.ceil(transferVolume / maxVolume);
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='8' />
<Setting Name='Estimated time' Value='7' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='' />
<Parameters >
Expand Down Expand Up @@ -812,7 +812,7 @@ var dispenseSteps = (tipVolume - deadVolume) / aliquotVolume;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='7' />
<Setting Name='Estimated time' Value='6' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Distancefromwellbottom = (columns &lt; 7) ? 0.5 : 0.3;' />
<Parameters >
Expand Down Expand Up @@ -860,7 +860,7 @@ var dispenseSteps = (tipVolume - deadVolume) / aliquotVolume;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='8' />
<Setting Name='Estimated time' Value='7' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Wellselection = [[1,++columnsDone]];' />
<Parameters >
Expand Down Expand Up @@ -903,12 +903,13 @@ var dispenseSteps = (tipVolume - deadVolume) / aliquotVolume;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='8' />
<Setting Name='Estimated time' Value='7' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='if(columns == columnsDone) {
task.Performtiptouch = true;
task.Whichsidestousefortiptouch = &quot;None&quot;;
task.Tiptouchretractdistance = -14.5;
task.Distancefromwellbottom = (columns &lt; 7) ? 5 : 15;
task.Tiptouchretractdistance = (columns &lt; 7) ? -4.5 : -14.5;
}' />
<Parameters >
<Parameter Category='' Name='Location, plate' Value='reagentPlate' />
Expand All @@ -917,7 +918,7 @@ var dispenseSteps = (tipVolume - deadVolume) / aliquotVolume;' />
<Parameter Category='Volume' Name='Volume' Value='0' />
<Parameter Category='Volume' Name='Blowout volume' Value='0' />
<Parameter Category='Properties' Name='Liquid class' Value='j_normal_large_vol' />
<Parameter Category='Properties' Name='Distance from well bottom' Value='15' />
<Parameter Category='Properties' Name='Distance from well bottom' Value='' />
<Parameter Category='Properties' Name='Dynamic tip retraction' Value='0' />
<Parameter Category='Tip Touch' Name='Perform tip touch' Value='0' />
<Parameter Category='Tip Touch' Name='Which sides to use for tip touch' Value='None' />
Expand Down Expand Up @@ -950,7 +951,7 @@ var dispenseSteps = (tipVolume - deadVolume) / aliquotVolume;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='7' />
<Setting Name='Estimated time' Value='6' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='' />
<Parameters >
Expand Down Expand Up @@ -1046,7 +1047,7 @@ var aspirateSteps = Math.ceil(transferVolume / maxVolume);
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='8' />
<Setting Name='Estimated time' Value='7' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='' />
<Parameters >
Expand Down Expand Up @@ -1099,7 +1100,7 @@ var dispenseSteps = (tipVolume - deadVolume) / aliquotVolume;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='8' />
<Setting Name='Estimated time' Value='7' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Distancefromwellbottom = (columns &lt; 7) ? 0.4 : 0.25;' />
<Parameters >
Expand Down Expand Up @@ -1147,7 +1148,7 @@ var dispenseSteps = (tipVolume - deadVolume) / aliquotVolume;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='7' />
<Setting Name='Estimated time' Value='6' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Wellselection = [[1,++columnsDone]];' />
<Parameters >
Expand Down Expand Up @@ -1190,7 +1191,7 @@ var dispenseSteps = (tipVolume - deadVolume) / aliquotVolume;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='8' />
<Setting Name='Estimated time' Value='7' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='if(columns == columnsDone) {
task.Performtiptouch = true;
Expand Down Expand Up @@ -1237,7 +1238,7 @@ var dispenseSteps = (tipVolume - deadVolume) / aliquotVolume;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='7' />
<Setting Name='Estimated time' Value='6' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='' />
<Parameters >
Expand Down Expand Up @@ -1340,7 +1341,7 @@ var mTouchRetract = -4;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='8' />
<Setting Name='Estimated time' Value='7' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='if(mGetTips) {
task.Wellselection = mTipSelection;
Expand Down Expand Up @@ -1370,7 +1371,7 @@ var mTouchRetract = -4;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='7' />
<Setting Name='Estimated time' Value='6' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Wellselection = mWellSelection;
task.Volume = mPreAspVolume;
Expand Down Expand Up @@ -1469,7 +1470,7 @@ task.Distancefromwellbottom = mAspDistance;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='9' />
<Setting Name='Estimated time' Value='8' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Wellselection = mWellSelection;
task.Volume = mTransferVolume / mNumberSteps;
Expand Down Expand Up @@ -1536,7 +1537,7 @@ task.Distancefromwellbottom = mDispDistance;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='57' />
<Setting Name='Estimated time' Value='49' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='if(mMixVolume &gt; maxVolume) {
mMixVolume = maxVolume * 0.8;
Expand Down Expand Up @@ -1586,7 +1587,7 @@ task.Wellselection = mWellSelection;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='2' />
<Setting Name='Estimated time' Value='1' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='' />
<Parameters >
Expand All @@ -1607,7 +1608,7 @@ task.Wellselection = mWellSelection;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='14' />
<Setting Name='Estimated time' Value='13' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Wellselection = mWellSelection;
task.Volume = mPreAspVolume;
Expand Down Expand Up @@ -1651,7 +1652,7 @@ if(mDoTipTouch) {
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='6' />
<Setting Name='Estimated time' Value='5' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='if(mReturnTips) {
task.Wellselection = mTipSelection;
Expand Down Expand Up @@ -1782,7 +1783,7 @@ var mTouchRetract = -4;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='8' />
<Setting Name='Estimated time' Value='7' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='if(mGetTips) {
task.Wellselection = mTipSelection;
Expand Down Expand Up @@ -1812,7 +1813,7 @@ var mTouchRetract = -4;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='6' />
<Setting Name='Estimated time' Value='5' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Wellselection = mWellSelection;
task.Volume = mPreAspVolume;
Expand Down Expand Up @@ -1911,7 +1912,7 @@ task.Distancefromwellbottom = mAspDistance;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='14' />
<Setting Name='Estimated time' Value='13' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Wellselection = mWellSelection;
task.Volume = mTransferVolume / mNumberSteps;
Expand Down Expand Up @@ -1957,7 +1958,7 @@ task.Distancefromwellbottom = mDispDistance;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='32' />
<Setting Name='Estimated time' Value='27' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='if(mMixVolume &gt; maxVolume) {
mMixVolume = maxVolume * 0.8;
Expand Down Expand Up @@ -2007,7 +2008,7 @@ task.Wellselection = mWellSelection;' />
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='14' />
<Setting Name='Estimated time' Value='13' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='task.Wellselection = mWellSelection;
task.Volume = mPreAspVolume;
Expand Down Expand Up @@ -2051,7 +2052,7 @@ if(mDoTipTouch) {
<Task_Disabled >0</Task_Disabled>
<Has_Breakpoint >0</Has_Breakpoint>
<Advanced_Settings >
<Setting Name='Estimated time' Value='6' />
<Setting Name='Estimated time' Value='5' />
</Advanced_Settings>
<TaskScript Name='TaskScript' Value='if(mReturnTips) {
task.Wellselection = mTipSelection;
Expand Down
Loading

0 comments on commit 23c6531

Please sign in to comment.