Changeset 4391 in ntrip for trunk/BNC/src/bncpppclient.cpp
- Timestamp:
- Jul 6, 2012, 4:09:16 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bncpppclient.cpp
r4389 r4391 160 160 // -------------------- 161 161 if (obs.satSys == 'G') { 162 if ( (obs.p1() || obs.c1()) && (obs.p2() || obs.c2()) && obs.l1() && obs.l2() ) { 162 double C1C = obs.measdata("C1C"); 163 double C1P = obs.measdata("C1P"); 164 double C2C = obs.measdata("C2C"); 165 double C2P = obs.measdata("C2P"); 166 double L1 = obs.measdata("L1"); 167 double L2 = obs.measdata("L2"); 168 if ( (C1P || C1C) && (C2P || C2C) && L1 && L2 ) { 163 169 double f1 = t_CST::freq1; 164 170 double f2 = t_CST::freq2; 165 171 double c1 = f1 * f1 / (f1 * f1 - f2 * f2); 166 172 double c2 = - f2 * f2 / (f1 * f1 - f2 * f2); 167 if ( obs.p1()) {168 satData->P1 = obs.p1()+ (bb ? bb->p1 : 0.0);173 if (C1P) { 174 satData->P1 = C1P + (bb ? bb->p1 : 0.0); 169 175 } 170 176 else { 171 satData->P1 = obs.c1()+ (bb ? bb->c1 : 0.0);172 } 173 if ( obs.p2()) {174 satData->P2 = obs.p2()+ (bb ? bb->p2 : 0.0);177 satData->P1 = C1C + (bb ? bb->c1 : 0.0); 178 } 179 if (C2P) { 180 satData->P2 = C2P + (bb ? bb->p2 : 0.0); 175 181 } 176 182 else { 177 satData->P2 = obs.c2();178 } 179 satData->L1 = obs.l1()* t_CST::c / f1;180 satData->L2 = obs.l2()* t_CST::c / f2;183 satData->P2 = C2C; 184 } 185 satData->L1 = L1 * t_CST::c / f1; 186 satData->L2 = L2 * t_CST::c / f2; 181 187 satData->P3 = c1 * satData->P1 + c2 * satData->P2; 182 188 satData->L3 = c1 * satData->L1 + c2 * satData->L2; … … 193 199 // ------------------------ 194 200 else if (obs.satSys == 'R') { 195 if ( (obs.p1() || obs.c1()) && (obs.p2() || obs.c2()) && obs.l1() && obs.l2() ) { 201 double C1C = obs.measdata("C1C"); 202 double C1P = obs.measdata("C1P"); 203 double C2C = obs.measdata("C2C"); 204 double C2P = obs.measdata("C2P"); 205 double L1 = obs.measdata("L1"); 206 double L2 = obs.measdata("L2"); 207 if ( (C1P || C1C) && (C2P || C2C) && L1 && L2 ) { 196 208 double f1 = t_CST::f1(obs.satSys, obs.slotNum); 197 209 double f2 = t_CST::f2(obs.satSys, obs.slotNum); 198 210 double c1 = f1 * f1 / (f1 * f1 - f2 * f2); 199 211 double c2 = - f2 * f2 / (f1 * f1 - f2 * f2); 200 if ( obs.p1()) {201 satData->P1 = obs.p1()+ (bb ? bb->p1 : 0.0);212 if (C1P) { 213 satData->P1 = C1P + (bb ? bb->p1 : 0.0); 202 214 } 203 215 else { 204 satData->P1 = obs.c1()+ (bb ? bb->c1 : 0.0);205 } 206 if ( obs.p2()) {207 satData->P2 = obs.p2()+ (bb ? bb->p2 : 0.0);216 satData->P1 = C1C + (bb ? bb->c1 : 0.0); 217 } 218 if (C2P) { 219 satData->P2 = C2P + (bb ? bb->p2 : 0.0); 208 220 } 209 221 else { 210 satData->P2 = obs.c2();211 } 212 satData->L1 = obs.l1()* t_CST::c / f1;213 satData->L2 = obs.l2()* t_CST::c / f2;222 satData->P2 = C2C; 223 } 224 satData->L1 = L1 * t_CST::c / f1; 225 satData->L2 = L2 * t_CST::c / f2; 214 226 satData->P3 = c1 * satData->P1 + c2 * satData->P2; 215 227 satData->L3 = c1 * satData->L1 + c2 * satData->L2; … … 226 238 // ------------------------ 227 239 else if (obs.satSys == 'E') { 228 if ( obs.c1() && obs.c5() && obs.l1() && obs.l5()) { 240 double C1 = obs.measdata("C1"); 241 double L1 = obs.measdata("L1"); 242 double C5 = obs.measdata("C5"); 243 double L5 = obs.measdata("L5"); 244 if ( C1 && C5 && L1 && L5) { 229 245 double f1 = t_CST::freq1; 230 246 double f5 = t_CST::freq5; … … 232 248 double c5 = - f5 * f5 / (f1 * f1 - f5 * f5); 233 249 234 satData->P1 = obs.c1();235 satData->P5 = obs.c5();236 satData->L1 = obs.l1()* t_CST::c / f1;237 satData->L5 = obs.l5()* t_CST::c / f5;250 satData->P1 = C1; 251 satData->P5 = C5; 252 satData->L1 = L1 * t_CST::c / f1; 253 satData->L5 = L5 * t_CST::c / f5; 238 254 satData->P3 = c1 * satData->P1 + c5 * satData->P5; 239 255 satData->L3 = c1 * satData->L1 + c5 * satData->L5;
Note:
See TracChangeset
for help on using the changeset viewer.