Changeset 2285 for branches

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:

• STFocus.h (modified) (1 diff)
• STMath.cpp (modified) (2 diffs)
• STMath.h (modified) (1 diff)
• Templates.cpp (modified) (1 diff)

branches/parallel/src/STFocus.h

@@ -65 +65 @@
   casa::ScalarColumn<casa::Float> rotationCol_, axisCol_,
     tanCol_,handCol_, parangleCol_,
-    mountCol_,userCol_, xyphCol_,xyphoffCol_,;
+    mountCol_,userCol_, xyphCol_,xyphoffCol_;
 };
 

branches/parallel/src/STMath.cpp

@@ -989 +989 @@
   Vector<Float> tcalout2;  //debug
 
+  const Table& subtcal = caloff->tcal().table();
+  static STMath::TcalIDmap mt1;
+  const Table& tout_const = caloff->table();
+  ROScalarColumn<uInt> outTcalIdCol(tout_const, "TCAL_ID");
+  Vector<uInt> vinID = outTcalIdCol.getColumn();
+  vector<unsigned int> vint,vintsub;
+  ROScalarColumn<uInt> outtcalSubIdCol(subtcal, "ID");
+  Vector<uInt> vinSubRowNo = outtcalSubIdCol.getColumn();
+  ROArrayColumn<Float> TCAL_Col(subtcal, "TCAL");
+  vector<unsigned int>::iterator ite_vint=vint.begin(),ite_vintsub=vintsub.begin();
+  vint.insert(ite_vint,vinID.begin(),vinID.end());
+  vintsub.insert(ite_vintsub,vinSubRowNo.begin(),vinSubRowNo.end());
+  mt1.insert(pair<vector<unsigned int>,vector<unsigned int> > (vint,vintsub) );
+  TcalIDmap::iterator ite_p;
+  ite_p = mt1.find(vint);
+
   if ( tout.nrow() != tcon.nrow() ) {
     throw(AipsError("Mismatch in number of rows to form cal on - off pair."));
@@ -1062 +1078 @@
       tcalUsed = tcal;
       if ( tcal <= 0.0 ) {
-        caloff->tcal().getEntry(tcalt, tcalout, tcalId);
+        // caloff->tcal().getEntry(tcalt, tcalout, tcalId);
+        uInt intTCAL = ite_p->second[(unsigned int)tcalId];
+        TCAL_Col.get(intTCAL,tcalout);
 //         if (polno<=3) {
 //           tcalUsed = tcalout[polno];

branches/parallel/src/STMath.h

@@ -428 +428 @@
 
   bool insitu_;
+
+  typedef std::map<std::vector<unsigned int>,std::vector<unsigned int> > TcalIDmap;
 };
 

branches/parallel/src/Templates.cpp

@@ -81 +81 @@
 
 //template void convertArray<Bool, uChar>(Array<Bool> &, Array<uChar> const &);
-template void convertArray<uChar, Bool>(Array<uChar> &, Array<Bool> const &);
+template void casa::convertArray<uChar, Bool>(Array<uChar> &, Array<Bool> const &);
 
-template Array<Float>& operator/=<Float>(Array<Float>&, MaskedArray<Float> const&);
-template MaskedArray<Float> const& operator*=<Float>(MaskedArray<Float> const&, Float const&);
-template MaskedArray<Float> const& operator*=<Float>(MaskedArray<Float> const&, Array<Float> const&);
-template MaskedArray<Float> const& operator/=<Float>(MaskedArray<Float> const&, Float const&);
-template MaskedArray<Float> operator+<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
-template MaskedArray<Float> operator-<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
-template MaskedArray<Float> operator-<Float>(MaskedArray<Float> const&, Array<Float> const&);
+template Array<Float>& casa::operator/=<Float>(Array<Float>&, MaskedArray<Float> const&);
+template MaskedArray<Float> const& casa::operator*=<Float>(MaskedArray<Float> const&, Float const&);
+template MaskedArray<Float> const& casa::operator*=<Float>(MaskedArray<Float> const&, Array<Float> const&);
+template MaskedArray<Float> const& casa::operator/=<Float>(MaskedArray<Float> const&, Float const&);
+template MaskedArray<Float> casa::operator+<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
+template MaskedArray<Float> casa::operator-<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
+template MaskedArray<Float> casa::operator-<Float>(MaskedArray<Float> const&, Array<Float> const&);
 
-template MaskedArray<Float> operator/<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
+template MaskedArray<Float> casa::operator/<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
 
-template MaskedArray<Float> operator*<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
-template MaskedArray<Float> operator*<Float>(MaskedArray<Float> const&, Array<Float> const&);
-template MaskedArray<Float> operator*<Float>(Array<Float> const&, MaskedArray<Float> const&);
-template MaskedArray<Float> operator*<Float>(Float const&, MaskedArray<Float> const&);
-template Float stddev<Float>(MaskedArray<Float> const&);
-template Float median<Float>(MaskedArray<Float> const&, Bool, Bool);
-template Float sumsquares<Float>(MaskedArray<Float> const&);
-template Float avdev<Float>(MaskedArray<Float> const&);
+template MaskedArray<Float> casa::operator*<Float>(MaskedArray<Float> const&, MaskedArray<Float> const&);
+template MaskedArray<Float> casa::operator*<Float>(MaskedArray<Float> const&, Array<Float> const&);
+template MaskedArray<Float> casa::operator*<Float>(Array<Float> const&, MaskedArray<Float> const&);
+template MaskedArray<Float> casa::operator*<Float>(Float const&, MaskedArray<Float> const&);
+template Float casa::stddev<Float>(MaskedArray<Float> const&);
+template Float casa::median<Float>(MaskedArray<Float> const&, Bool, Bool);
+template Float casa::sumsquares<Float>(MaskedArray<Float> const&);
+template Float casa::avdev<Float>(MaskedArray<Float> const&);
 
 template void LatticeUtilities::bin(MaskedArray<float>&, MaskedArray<float> const&, uInt, uInt);