Source
1063
1063
if(!usezero_p) {
1064
1064
for (Int rownr=startRow; rownr<=endRow; rownr++) {
1065
1065
if(vb.antenna1()(rownr)==vb.antenna2()(rownr)) rowFlags(rownr)=1;
1066
1066
}
1067
1067
}
1068
1068
1069
1069
1070
1070
1071
1071
1072
1072
//Tell the gridder to grid the weights too ...need to do that once only
1073
-
Int doWeightGridding=1;
1074
-
if(doneWeightImage_p)
1075
-
doWeightGridding=-1;
1073
+
//Int doWeightGridding=1;
1074
+
//if(doneWeightImage_p)
1075
+
// doWeightGridding=-1;
1076
1076
Bool del;
1077
1077
// IPosition s(flags.shape());
1078
1078
const IPosition& fs=flags.shape();
1079
1079
//cerr << "flags shape " << fs << endl;
1080
1080
std::vector<Int>s(fs.begin(), fs.end());
1081
1081
Int nvp=s[0];
1082
1082
Int nvc=s[1];
1083
1083
Int nvisrow=s[2];
1084
1084
Int csamp=convSampling;
1085
1085
Bool uvwcopy;
1183
1183
Int csupp=convSupport;
1184
1184
const Int *convrowmapstor=convRowMap_p.getStorage(del);
1185
1185
const Int *convchanmapstor=convChanMap_p.getStorage(del);
1186
1186
const Int *convpolmapstor=convPolMap_p.getStorage(del);
1187
1187
////////***************************
1188
1188
tim.mark();
1189
1189
1190
1190
if(useDoubleGrid_p) {
1191
1191
DComplex *gridstor=griddedData2.getStorage(gridcopy);
1192
1192
1193
-
#pragma omp parallel default(none) private(icounter, del) firstprivate(idopsf, doWeightGridding, datStorage, wgtStorage, flagstor, rowflagstor, convstor, wconvstor, pmapstor, cmapstor, gridstor, csupp, nxp, nyp, np, nc,ixsub, iysub, rend, rbeg, csamp, csize, nvp, nvc, nvisrow, phasorstor, locstor, offstor, convrowmapstor, convchanmapstor, convpolmapstor, nPolConv, nChanConv, nConvFunc,xsect, ysect, nxsect, nysect) shared(swgtptr)
1193
+
#pragma omp parallel default(none) private(icounter, del) firstprivate(idopsf, /*doWeightGridding,*/ datStorage, wgtStorage, flagstor, rowflagstor, convstor, wconvstor, pmapstor, cmapstor, gridstor, csupp, nxp, nyp, np, nc,ixsub, iysub, rend, rbeg, csamp, csize, nvp, nvc, nvisrow, phasorstor, locstor, offstor, convrowmapstor, convchanmapstor, convpolmapstor, nPolConv, nChanConv, nConvFunc,xsect, ysect, nxsect, nysect) shared(swgtptr)
1194
1194
{
1195
1195
#pragma omp for schedule(dynamic)
1196
1196
for(icounter=0; icounter < ixsub*iysub; ++icounter){
1197
1197
Int x0=xsect(icounter);
1198
1198
Int y0=ysect(icounter);
1199
1199
Int nxsub=nxsect(icounter);
1200
1200
Int nysub=nysect(icounter);
1201
1201
1202
1202
/*
1203
1203
ix= (icounter+1)-((icounter)/ixsub)*ixsub;
1266
1266
&rend, locstor, offstor, phasorstor);
1267
1267
griddedWeight2.putStorage(gridwgtstor, weightcopy);
1268
1268
1269
1269
}
1270
1270
timemass_p+=tim.real();
1271
1271
}
1272
1272
else {
1273
1273
//cerr << "maps " << convChanMap_p << " " << chanMap << endl;
1274
1274
//cerr << "nchan " << nchan << " nchanconv " << nChanConv << endl;
1275
1275
Complex *gridstor=griddedData.getStorage(gridcopy);
1276
-
#pragma omp parallel default(none) private(icounter, del) firstprivate(idopsf, doWeightGridding, datStorage, wgtStorage, flagstor, rowflagstor, convstor, wconvstor, pmapstor, cmapstor, gridstor, csupp, nxp, nyp, np, nc,ixsub, iysub, rend, rbeg, csamp, csize, nvp, nvc, nvisrow, phasorstor, locstor, offstor, convrowmapstor, convchanmapstor, convpolmapstor, nPolConv, nChanConv, nConvFunc, xsect, ysect, nxsect, nysect) shared(swgtptr)
1276
+
#pragma omp parallel default(none) private(icounter, del) firstprivate(idopsf, /*doWeightGridding,*/ datStorage, wgtStorage, flagstor, rowflagstor, convstor, wconvstor, pmapstor, cmapstor, gridstor, csupp, nxp, nyp, np, nc,ixsub, iysub, rend, rbeg, csamp, csize, nvp, nvc, nvisrow, phasorstor, locstor, offstor, convrowmapstor, convchanmapstor, convpolmapstor, nPolConv, nChanConv, nConvFunc, xsect, ysect, nxsect, nysect) shared(swgtptr)
1277
1277
{
1278
1278
#pragma omp for schedule(dynamic)
1279
1279
for(icounter=0; icounter < ixsub*iysub; ++icounter){
1280
1280
/*ix= (icounter+1)-((icounter)/ixsub)*ixsub;
1281
1281
iy=(icounter)/ixsub+1;
1282
1282
y0=(nyp/iysub)*(iy-1)+1;
1283
1283
nysub=nyp/iysub;
1284
1284
if( iy == iysub) {
1285
1285
nysub=nyp-(nyp/iysub)*(iy-1);
1286
1286
}