Changeset 4914


Ignore:
Timestamp:
Apr 29, 2009, 3:36:38 PM (13 years ago)
Author:
Nicklas Nordborg
Message:

References #1120: The dynamic part of BASE should keep track whether intensity data is in log space or not

Lowess and median ration normalizations has been fixed.

Location:
trunk/src/plugins/core/net/sf/basedb/plugins
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/plugins/core/net/sf/basedb/plugins/LowessNormalization.java

    r4889 r4914  
    398398    // Expressions used to get data
    399399    Expression block = Dynamic.rawData("block");
    400     Expression ch1 = Dynamic.column(VirtualColumn.channel(1));
    401     Expression ch2 = Dynamic.column(VirtualColumn.channel(2));
     400    Expression ch1 = Dynamic.column(VirtualColumn.channelIntensity(1));
     401    Expression ch2 = Dynamic.column(VirtualColumn.channelIntensity(2));
    402402
    403403    // Create restriction: ch1 > 0 and ch2 > 0
  • trunk/src/plugins/core/net/sf/basedb/plugins/MedianRatioNormalization.java

    r4889 r4914  
    422422   
    423423    // Expressions used to get data
    424     Expression ch1 = Dynamic.column(VirtualColumn.channel(1));
     424    Expression ch1 = Dynamic.column(VirtualColumn.channelIntensity(1));
    425425
    426426    // Create restriction: ch1 > minIntensity
    427427    Restriction intensityRestriction = Restrictions.and
    428       ( Restrictions.gt(Dynamic.column(VirtualColumn.channel(1)),
     428      ( Restrictions.gt(Dynamic.column(VirtualColumn.channelIntensity(1)),
    429429                        Expressions.aFloat(minIntensity)) );
    430430
     
    546546    // Expressions used to get data
    547547    Expression block = Dynamic.rawData("block");
    548     Expression ch1 = Dynamic.column(VirtualColumn.channel(1));
    549     Expression ch2 = Dynamic.column(VirtualColumn.channel(2));
     548    Expression ch1 = Dynamic.column(VirtualColumn.channelIntensity(1));
     549    Expression ch2 = Dynamic.column(VirtualColumn.channelIntensity(2));
    550550   
    551551    //   Create restriction: ch1 > minIntensity and ch2 > minIntensity
    552552    Restriction intensityRestriction = Restrictions.and
    553553    (
    554       Restrictions.gt(Dynamic.column(VirtualColumn.channel(1)), Expressions.aFloat(minIntensity)),
    555       Restrictions.gt(Dynamic.column(VirtualColumn.channel(2)), Expressions.aFloat(minIntensity))
     554      Restrictions.gt(Dynamic.column(VirtualColumn.channelIntensity(1)), Expressions.aFloat(minIntensity)),
     555      Restrictions.gt(Dynamic.column(VirtualColumn.channelIntensity(2)), Expressions.aFloat(minIntensity))
    556556    );
    557557   
Note: See TracChangeset for help on using the changeset viewer.