Changeset 2247 for branches/parallel/src/FillerBase.h

Timestamp:

07/25/11 14:57:22 (13 years ago)

Author:

Takeshi Nakazato

Message:

merged changes in trunk (r2209,r2202,r2243

Location:

branches/parallel

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/FillerBase.h (modified) (1 diff)

branches/parallel/src/FillerBase.h

@@ -77 +77 @@
                             casa::Float windspeed=0.0f,
                             casa::Float windaz=0.0f);
+    void setWeather2(casa::Float temperature=0.0f,
+                            casa::Float pressure=0.0f,
+                            casa::Float humidity=0.0f,
+                            casa::Float windspeed=0.0f,
+                            casa::Float windaz=0.0f);
     void setTcal(const casa::String& caltime="",
+                         const casa::Vector<casa::Float>& tcal=casa::Vector<casa::Float>());
+    void setTcal2(const casa::String& caltime="",
                          const casa::Vector<casa::Float>& tcal=casa::Vector<casa::Float>());
     void setScanRate(const casa::Vector<casa::Double>& srate=casa::Vector<casa::Double>());