Changeset 2285 for branches/parallel


Ignore:
Timestamp:
09/01/11 17:20:33 (13 years ago)
Author:
ShinnosukeKawakami
Message:

New Development: No

JIRA Issue: No List JIRA ticket.

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: fls3a_hi_regression.py

Put in Release Notes: No

Module(s): _asap.so

Description: (1)Replaced getEntry to map within dototalpower in STMath.cpp and STMath.h. (2) modified STFocus.h and Templates to pass build by using Intel Compiler successfully.


Location:
branches/parallel/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/parallel/src/STFocus.h

    r1586 r2285  
    6565  casa::ScalarColumn<casa::Float> rotationCol_, axisCol_,
    6666    tanCol_,handCol_, parangleCol_,
    67     mountCol_,userCol_, xyphCol_,xyphoffCol_,;
     67    mountCol_,userCol_, xyphCol_,xyphoffCol_;
    6868};
    6969
  • branches/parallel/src/STMath.cpp

    r2267 r2285  
    989989  Vector<Float> tcalout2;  //debug
    990990
     991  const Table& subtcal = caloff->tcal().table();
     992  static STMath::TcalIDmap mt1;
     993  const Table& tout_const = caloff->table();
     994  ROScalarColumn<uInt> outTcalIdCol(tout_const, "TCAL_ID");
     995  Vector<uInt> vinID = outTcalIdCol.getColumn();
     996  vector<unsigned int> vint,vintsub;
     997  ROScalarColumn<uInt> outtcalSubIdCol(subtcal, "ID");
     998  Vector<uInt> vinSubRowNo = outtcalSubIdCol.getColumn();
     999  ROArrayColumn<Float> TCAL_Col(subtcal, "TCAL");
     1000  vector<unsigned int>::iterator ite_vint=vint.begin(),ite_vintsub=vintsub.begin();
     1001  vint.insert(ite_vint,vinID.begin(),vinID.end());
     1002  vintsub.insert(ite_vintsub,vinSubRowNo.begin(),vinSubRowNo.end());
     1003  mt1.insert(pair<vector<unsigned int>,vector<unsigned int> > (vint,vintsub) );
     1004  TcalIDmap::iterator ite_p;
     1005  ite_p = mt1.find(vint);
     1006
    9911007  if ( tout.nrow() != tcon.nrow() ) {
    9921008    throw(AipsError("Mismatch in number of rows to form cal on - off pair."));
     
    10621078      tcalUsed = tcal;
    10631079      if ( tcal <= 0.0 ) {
    1064         caloff->tcal().getEntry(tcalt, tcalout, tcalId);
     1080        // caloff->tcal().getEntry(tcalt, tcalout, tcalId);
     1081        uInt intTCAL = ite_p->second[(unsigned int)tcalId];
     1082        TCAL_Col.get(intTCAL,tcalout);
    10651083//         if (polno<=3) {
    10661084//           tcalUsed = tcalout[polno];
  • branches/parallel/src/STMath.h

    r1937 r2285  
    428428
    429429  bool insitu_;
     430
     431  typedef std::map<std::vector<unsigned int>,std::vector<unsigned int> > TcalIDmap;
    430432};
    431433
  • branches/parallel/src/Templates.cpp

    r1819 r2285  
    8181
    8282//template void convertArray<Bool, uChar>(Array<Bool> &, Array<uChar> const &);
    83 template void convertArray<uChar, Bool>(Array<uChar> &, Array<Bool> const &);
     83template void casa::convertArray<uChar, Bool>(Array<uChar> &, Array<Bool> const &);
    8484
    85 template Array<Float>& operator/=<Float>(Array<Float>&, MaskedArray<Float> const&);
    86 template MaskedArray<Float> const& operator*=<Float>(MaskedArray<Float> const&, Float const&);
    87 template MaskedArray<Float> const& operator*=<Float>(MaskedArray<Float> const&, Array<Float> const&);
    88 template MaskedArray<Float> const& operator/=<Float>(MaskedArray<Float> const&, Float const&);
    89 template MaskedArray<Float> operator+<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
    90 template MaskedArray<Float> operator-<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
    91 template MaskedArray<Float> operator-<Float>(MaskedArray<Float> const&, Array<Float> const&);
     85template Array<Float>& casa::operator/=<Float>(Array<Float>&, MaskedArray<Float> const&);
     86template MaskedArray<Float> const& casa::operator*=<Float>(MaskedArray<Float> const&, Float const&);
     87template MaskedArray<Float> const& casa::operator*=<Float>(MaskedArray<Float> const&, Array<Float> const&);
     88template MaskedArray<Float> const& casa::operator/=<Float>(MaskedArray<Float> const&, Float const&);
     89template MaskedArray<Float> casa::operator+<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
     90template MaskedArray<Float> casa::operator-<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
     91template MaskedArray<Float> casa::operator-<Float>(MaskedArray<Float> const&, Array<Float> const&);
    9292
    93 template MaskedArray<Float> operator/<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
     93template MaskedArray<Float> casa::operator/<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
    9494
    95 template MaskedArray<Float> operator*<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
    96 template MaskedArray<Float> operator*<Float>(MaskedArray<Float> const&, Array<Float> const&);
    97 template MaskedArray<Float> operator*<Float>(Array<Float> const&, MaskedArray<Float> const&);
    98 template MaskedArray<Float> operator*<Float>(Float const&, MaskedArray<Float> const&);
    99 template Float stddev<Float>(MaskedArray<Float> const&);
    100 template Float median<Float>(MaskedArray<Float> const&, Bool, Bool);
    101 template Float sumsquares<Float>(MaskedArray<Float> const&);
    102 template Float avdev<Float>(MaskedArray<Float> const&);
     95template MaskedArray<Float> casa::operator*<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
     96template MaskedArray<Float> casa::operator*<Float>(MaskedArray<Float> const&, Array<Float> const&);
     97template MaskedArray<Float> casa::operator*<Float>(Array<Float> const&, MaskedArray<Float> const&);
     98template MaskedArray<Float> casa::operator*<Float>(Float const&, MaskedArray<Float> const&);
     99template Float casa::stddev<Float>(MaskedArray<Float> const&);
     100template Float casa::median<Float>(MaskedArray<Float> const&, Bool, Bool);
     101template Float casa::sumsquares<Float>(MaskedArray<Float> const&);
     102template Float casa::avdev<Float>(MaskedArray<Float> const&);
    103103
    104104template void LatticeUtilities::bin(MaskedArray<float>&, MaskedArray<float> const&, uInt, uInt);
Note: See TracChangeset for help on using the changeset viewer.