[casacore] r21590 committed - Fixed warnings

[casa...@googlecode.com]

Revision: 21590
Author: gervandiepen
Date: Thu Mar 26 19:30:16 2015 UTC
Log: Fixed warnings

https://code.google.com/p/casacore/source/detail?r=21590

Modified:
/branches/nov14/ms/MSOper/MSMetaData.cc
/branches/nov14/scimath/Mathematics/InterpolateArray1D.tcc

=======================================
--- /branches/nov14/ms/MSOper/MSMetaData.cc Wed Mar 25 14:33:54 2015 UTC
+++ /branches/nov14/ms/MSOper/MSMetaData.cc Thu Mar 26 19:30:16 2015 UTC
@@ -626,12 +626,12 @@
//_getSubScanProperties(subScanProps, scanProps, arrayProps);
map<SubScanKey, SubScanProperties>::const_iterator iter =
subScanProps.begin();
map<SubScanKey, SubScanProperties>::const_iterator end =
subScanProps.end();
- ScanKey key;
+ //ScanKey key;
while (iter != end) {
SubScanKey subKey = iter->first;
- key.obsID = subKey.obsID;
- key.arrayID = subKey.arrayID;
- key.scan = subKey.scan;
+ //key.obsID = subKey.obsID;
+ //key.arrayID = subKey.arrayID;
+ //key.scan = subKey.scan;
SubScanProperties subProps = iter->second;
myScanToStatesMap[scanKey(subKey)].insert(subProps.stateIDs.begin(),
subProps.stateIDs.end());
++iter;
@@ -3748,7 +3748,7 @@
spwInfo[i].name = name[i];
if (myHasBBCNo) {
spwInfo[i].bbcno = bbcno[i];
- if(name[i].contains(rxSqld)) {
+ if (name[i].contains(rxSqld)) {
sqldSpw.insert(i);
}
}
@@ -3763,10 +3763,12 @@
) {
fdmSpw.insert(i);
}
- else if (spwInfo[i].nchans==1) {
+ else if (
+ spwInfo[i].nchans == 1 && ! name[i].contains("FULL_RES")
+ ) {
avgSpw.insert(i);
}
- else if (spwInfo[i].nchans==4) {
+ else if (spwInfo[i].nchans == 4) {
wvrSpw.insert(i);
}
else {
=======================================
--- /branches/nov14/scimath/Mathematics/InterpolateArray1D.tcc Mon Feb 16
07:05:15 2015 UTC
+++ /branches/nov14/scimath/Mathematics/InterpolateArray1D.tcc Thu Mar 26
19:30:16 2015 UTC
@@ -162,11 +162,10 @@
const Cube<Range>& yin,
Int method)
{
- DebugAssert(ndim==3,AipsError);
Int nxout=xout.nelements();
IPosition yinShape=yin.shape();
//check the number of elements in y
- DebugAssert(nxin==yinShape(2),AipsError);
+ DebugAssert(xin.nelements()==yinShape(2),AipsError);

Bool deleteYin, deleteYout;
const Range* pyin=yin.getStorage(deleteYin);
@@ -206,7 +205,7 @@
{
Int nxout=xout.nelements();
IPosition yinShape=yin.shape();
- DebugAssert(nxin==yinShape(ndim-1),AipsError);
+ DebugAssert(xin.nelements()==yinShape(ndim-1),AipsError);
DebugAssert((yinFlags.shape() == yinShape), AipsError);

Bool deleteYin, deleteYout, deleteYinFlags, deleteYoutFlags;