Changeset 2747 for trunk/src

Timestamp:

01/23/13 19:22:04 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

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...

Changed implementation not to use friend.

Location:

trunk/src

Files:

• CalibrationManager.cpp (modified) (2 diffs)
• STCalSkyPSAlma.h (modified) (2 diffs)
• STCalTsys.h (modified) (2 diffs)
• STCalibration.h (modified) (3 diffs)

trunk/src/CalibrationManager.cpp

@@ -155 +155 @@
     STCalTsys cal(target_, spwlist_);
     cal.calibrate();
-    tsystables_.push_back(cal.applytable_);
+    tsystables_.push_back(cal.applytable());
   }
   else if (calmode_ == "PS") {
@@ -165 +165 @@
       STCalSkyPSAlma cal(target_);
       cal.calibrate();
-      skytables_.push_back(cal.applytable_);
+      skytables_.push_back(cal.applytable());
     }
     else {

trunk/src/STCalSkyPSAlma.h

@@ -29 +29 @@
 #include "STCalSkyTable.h"
 
-class CalibrationManager;
-
 namespace asap {
 
@@ -38 +36 @@
  */
 class STCalSkyPSAlma : public STCalibration {
-
-  friend class CalibrationManager;
-
 public:
   STCalSkyPSAlma(casa::CountedPtr<Scantable> &s);

trunk/src/STCalTsys.h

@@ -30 +30 @@
 #include "STCalTsysTable.h"
 
-class CalibrationManager;
-
 namespace asap {
 
@@ -39 +37 @@
  */
 class STCalTsys : public STCalibration {
-
-  friend class CalibrationManager;
-
 public:
   STCalTsys(casa::CountedPtr<Scantable> &s, vector<int> &iflist);

trunk/src/STCalibration.h

@@ -26 +26 @@
 #include "STApplyTable.h"
 
-class CalibrationManager;
-
 namespace asap {
 
@@ -35 +33 @@
  */
 class STCalibration {
-
-  friend class CalibrationManager;
-
 public:
   STCalibration(casa::CountedPtr<Scantable> &s);
@@ -46 +41 @@
 
   void save(casa::String name) {applytable_->save(name);}
-  const STApplyTable &applytable() {return *applytable_;}
+  //const STApplyTable &applytable() {return *applytable_;}
+  const casa::CountedPtr<STApplyTable> applytable() {return applytable_;}
 protected:
   virtual void setupSelector() = 0;