Changeset 2201 for trunk/src


Ignore:
Timestamp:
06/24/11 11:40:08 (13 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: Yes CAS-2819

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

IFNO is taken from ARRAY number.
Bug fix on checking if spectrometer is AOS or not.


Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/NROFiller.cpp

    r2199 r2201  
    9090  uInt scanno ;
    9191  uInt cycleno ;
     92  uInt ifno ;
    9293  uInt beamno ;
    9394  uInt polno ;
    … …  
    153154                               scanno,
    154155                               cycleno,
     156                               ifno,
    155157                               beamno,
    156158                               polno,
    … …  
    212214
    213215    // SCANNO, CYCLENO, IFNO, POLNO, and BEAMNO
    214     uInt ifno = table_->frequencies().addEntry( (Double)fqs[0], (Double)fqs[1], (Double)fqs[2] ) ;
     216    //uInt ifno = table_->frequencies().addEntry( (Double)fqs[0], (Double)fqs[1], (Double)fqs[2] ) ;
    215217    setIndex( scanno, cycleno, ifno, polno, beamno ) ;
    216218

  • trunk/src/STFiller.cpp

    r2163 r2201  
    635635  uInt scanno ;
    636636  uInt cycleno ;
     637  uInt iftmp ;
    637638  uInt beamno ;
    638639  uInt polno ;
    … …  
    692693                                  scanno,
    693694                                  cycleno,
     695                                  iftmp,
    694696                                  beamno,
    695697                                  polno,
Note: See TracChangeset for help on using the changeset viewer.