Changeset 4403 in ntrip for trunk/BNC/src/bncpppclient.cpp
- Timestamp:
- Jul 8, 2012, 11:35:48 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bncpppclient.cpp
r4391 r4403 160 160 // -------------------- 161 161 if (obs.satSys == 'G') { 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 ) { 162 double C1 = obs.measdata("C1", 2.0); 163 double P1 = obs.measdata("P1", 2.0); 164 double P2 = obs.measdata("P2", 2.0); 165 double L1 = obs.measdata("L1", 2.0); 166 double L2 = obs.measdata("L2", 2.0); 167 if ( (C1 || P1) && P2 && L1 && L2 ) { 169 168 double f1 = t_CST::freq1; 170 169 double f2 = t_CST::freq2; 171 170 double c1 = f1 * f1 / (f1 * f1 - f2 * f2); 172 171 double c2 = - f2 * f2 / (f1 * f1 - f2 * f2); 173 if ( C1P) {174 satData->P1 = C1P+ (bb ? bb->p1 : 0.0);172 if (P1) { 173 satData->P1 = P1 + (bb ? bb->p1 : 0.0); 175 174 } 176 175 else { 177 satData->P1 = C1C + (bb ? bb->c1 : 0.0); 178 } 179 if (C2P) { 180 satData->P2 = C2P + (bb ? bb->p2 : 0.0); 181 } 182 else { 183 satData->P2 = C2C; 184 } 176 satData->P1 = C1 + (bb ? bb->c1 : 0.0); 177 } 178 satData->P2 = P2 + (bb ? bb->p2 : 0.0); 179 185 180 satData->L1 = L1 * t_CST::c / f1; 186 181 satData->L2 = L2 * t_CST::c / f2; … … 199 194 // ------------------------ 200 195 else if (obs.satSys == 'R') { 201 double C1 C = obs.measdata("C1C");202 double C1P = obs.measdata("C1P");203 double C2 C = 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 double C1 = obs.measdata("C1", 2.0); 197 double P1 = obs.measdata("P1", 2.0); 198 double C2 = obs.measdata("C2", 2.0); 199 double P2 = obs.measdata("P2", 2.0); 200 double L1 = obs.measdata("L1", 2.0); 201 double L2 = obs.measdata("L2", 2.0); 202 if ( (P1 || C1) && (P2 || P2) && L1 && L2 ) { 208 203 double f1 = t_CST::f1(obs.satSys, obs.slotNum); 209 204 double f2 = t_CST::f2(obs.satSys, obs.slotNum); 210 205 double c1 = f1 * f1 / (f1 * f1 - f2 * f2); 211 206 double c2 = - f2 * f2 / (f1 * f1 - f2 * f2); 212 if ( C1P) {213 satData->P1 = C1P+ (bb ? bb->p1 : 0.0);207 if (P1) { 208 satData->P1 = P1 + (bb ? bb->p1 : 0.0); 214 209 } 215 210 else { 216 satData->P1 = C1 C+ (bb ? bb->c1 : 0.0);217 } 218 if ( C2P) {219 satData->P2 = C2P+ (bb ? bb->p2 : 0.0);211 satData->P1 = C1 + (bb ? bb->c1 : 0.0); 212 } 213 if (P2) { 214 satData->P2 = P2 + (bb ? bb->p2 : 0.0); 220 215 } 221 216 else { 222 satData->P2 = C2 C;217 satData->P2 = C2; 223 218 } 224 219 satData->L1 = L1 * t_CST::c / f1; … … 238 233 // ------------------------ 239 234 else if (obs.satSys == 'E') { 240 double C1 = obs.measdata("C1" );241 double L1 = obs.measdata("L1" );242 double C5 = obs.measdata("C5" );243 double L5 = obs.measdata("L5" );235 double C1 = obs.measdata("C1", 3.0); 236 double L1 = obs.measdata("L1", 3.0); 237 double C5 = obs.measdata("C5", 3.0); 238 double L5 = obs.measdata("L5", 3.0); 244 239 if ( C1 && C5 && L1 && L5) { 245 240 double f1 = t_CST::freq1;
Note:
See TracChangeset
for help on using the changeset viewer.