Changeset 4403 in ntrip for trunk/BNC/src/RTCM
- Timestamp:
- Jul 8, 2012, 11:35:48 AM (13 years ago)
- Location:
- trunk/BNC/src/RTCM
- Files:
-
- 3 edited
-
GPSDecoder.cpp (modified) (7 diffs)
-
GPSDecoder.h (modified) (3 diffs)
-
RTCM2Decoder.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/RTCM/GPSDecoder.cpp
r4401 r4403 92 92 // 93 93 ////////////////////////////////////////////////////////////////////////////// 94 void t_obs::setMeasdata(const QString& rnxStr, double value) { 95 int iEntry = -1; 96 measdata(rnxStr, &iEntry); 97 if (iEntry != -1) { 98 _measdata[iEntry] = value; 94 void t_obs::setMeasdata(const QString& rnxStr, float rnxVers, double value) { 95 int ie = iEntry(rnxStr, rnxVers); 96 if (ie != -1) { 97 _measdata[ie] = value; 99 98 } 100 99 } … … 102 101 // 103 102 ////////////////////////////////////////////////////////////////////////////// 104 double t_obs::measdata(const QString& rnxStr, int* p_iEntry) const { 105 106 int iEntry = -1; 103 double t_obs::measdata(const QString& rnxStr, float rnxVers) const { 104 int ie = iEntry(rnxStr, rnxVers); 105 if (ie != -1) { 106 return _measdata[ie]; 107 } 108 else { 109 return 0.0; 110 } 111 } 112 113 // 114 ////////////////////////////////////////////////////////////////////////////// 115 int t_obs::iEntry(const QString& rnxStr, float rnxVers) const { 116 117 int retVal = -1; 107 118 108 119 // GPS 109 120 // --- 110 121 if (satSys == 'G') { 111 if (rnxStr == "C1") iEntry= GNSSENTRY_C1NDATA;112 else if (rnxStr == "C1C") iEntry= GNSSENTRY_C1DATA;113 else if (rnxStr == "C1P" || rnxStr == "C1W") iEntry= GNSSENTRY_P1DATA;114 else if (rnxStr == "L1") iEntry= GNSSENTRY_L1NDATA;115 else if (rnxStr == "L1C") iEntry= GNSSENTRY_L1CDATA;116 else if (rnxStr == "L1P" || rnxStr == "L1W") iEntry= GNSSENTRY_L1PDATA;117 else if (rnxStr == "D1") iEntry= GNSSENTRY_D1NDATA;118 else if (rnxStr == "D1C") iEntry= GNSSENTRY_D1CDATA;119 else if (rnxStr == "D1P" || rnxStr == "D1W") iEntry= GNSSENTRY_D1PDATA;120 else if (rnxStr == "S1") iEntry= GNSSENTRY_S1NDATA;121 else if (rnxStr == "S1C") iEntry= GNSSENTRY_S1CDATA;122 else if (rnxStr == "S1P" || rnxStr == "S1W") iEntry= GNSSENTRY_S1PDATA;123 124 else if (rnxStr == "C2" || rnxStr == "C2X") iEntry= GNSSENTRY_C2DATA;125 else if (rnxStr == "C2P" || rnxStr == "C2W") iEntry= GNSSENTRY_P2DATA;126 else if (rnxStr == "L2" || rnxStr == "L2X") iEntry= GNSSENTRY_L2CDATA;127 else if (rnxStr == "L2P" || rnxStr == "L2W") iEntry= GNSSENTRY_L2PDATA;128 else if (rnxStr == "D2" || rnxStr == "D2X") iEntry= GNSSENTRY_D2CDATA;129 else if (rnxStr == "D2P" || rnxStr == "D2W") iEntry= GNSSENTRY_D2PDATA;130 else if (rnxStr == "S2" || rnxStr == "S2X") iEntry= GNSSENTRY_S2CDATA;131 else if (rnxStr == "S2P" || rnxStr == "S2W") iEntry= GNSSENTRY_S2PDATA;132 133 else if (rnxStr == "C5") iEntry= GNSSENTRY_C5DATA;134 else if (rnxStr == "D5") iEntry= GNSSENTRY_D5DATA;135 else if (rnxStr == "L5") iEntry= GNSSENTRY_L5DATA;136 else if (rnxStr == "S5") iEntry= GNSSENTRY_S5DATA;122 if (rnxStr == "C1") retVal = GNSSENTRY_C1NDATA; 123 else if (rnxStr == "C1C") retVal = GNSSENTRY_C1DATA; 124 else if (rnxStr == "C1P" || rnxStr == "C1W") retVal = GNSSENTRY_P1DATA; 125 else if (rnxStr == "L1") retVal = GNSSENTRY_L1NDATA; 126 else if (rnxStr == "L1C") retVal = GNSSENTRY_L1CDATA; 127 else if (rnxStr == "L1P" || rnxStr == "L1W") retVal = GNSSENTRY_L1PDATA; 128 else if (rnxStr == "D1") retVal = GNSSENTRY_D1NDATA; 129 else if (rnxStr == "D1C") retVal = GNSSENTRY_D1CDATA; 130 else if (rnxStr == "D1P" || rnxStr == "D1W") retVal = GNSSENTRY_D1PDATA; 131 else if (rnxStr == "S1") retVal = GNSSENTRY_S1NDATA; 132 else if (rnxStr == "S1C") retVal = GNSSENTRY_S1CDATA; 133 else if (rnxStr == "S1P" || rnxStr == "S1W") retVal = GNSSENTRY_S1PDATA; 134 135 else if (rnxStr == "C2" || rnxStr == "C2X") retVal = GNSSENTRY_C2DATA; 136 else if (rnxStr == "C2P" || rnxStr == "C2W") retVal = GNSSENTRY_P2DATA; 137 else if (rnxStr == "L2" || rnxStr == "L2X") retVal = GNSSENTRY_L2CDATA; 138 else if (rnxStr == "L2P" || rnxStr == "L2W") retVal = GNSSENTRY_L2PDATA; 139 else if (rnxStr == "D2" || rnxStr == "D2X") retVal = GNSSENTRY_D2CDATA; 140 else if (rnxStr == "D2P" || rnxStr == "D2W") retVal = GNSSENTRY_D2PDATA; 141 else if (rnxStr == "S2" || rnxStr == "S2X") retVal = GNSSENTRY_S2CDATA; 142 else if (rnxStr == "S2P" || rnxStr == "S2W") retVal = GNSSENTRY_S2PDATA; 143 144 else if (rnxStr == "C5") retVal = GNSSENTRY_C5DATA; 145 else if (rnxStr == "D5") retVal = GNSSENTRY_D5DATA; 146 else if (rnxStr == "L5") retVal = GNSSENTRY_L5DATA; 147 else if (rnxStr == "S5") retVal = GNSSENTRY_S5DATA; 137 148 } 138 149 … … 140 151 // ------- 141 152 else if (satSys == 'R') { 142 if (rnxStr == "C1C") iEntry= GNSSENTRY_C1DATA;143 else if (rnxStr == "C1P") iEntry= GNSSENTRY_P1DATA;144 else if (rnxStr == "L1C") iEntry= GNSSENTRY_L1CDATA;145 else if (rnxStr == "L1P") iEntry= GNSSENTRY_L1PDATA;146 else if (rnxStr == "D1C") iEntry= GNSSENTRY_D1CDATA;147 else if (rnxStr == "D1P") iEntry= GNSSENTRY_D1PDATA;148 else if (rnxStr == "S1C") iEntry= GNSSENTRY_S1CDATA;149 else if (rnxStr == "S1P") iEntry= GNSSENTRY_S1PDATA;150 151 else if (rnxStr == "C2C") iEntry= GNSSENTRY_C2DATA;152 else if (rnxStr == "C2P") iEntry= GNSSENTRY_P2DATA;153 else if (rnxStr == "L2C") iEntry= GNSSENTRY_L2CDATA;154 else if (rnxStr == "L2P") iEntry= GNSSENTRY_L2PDATA;155 else if (rnxStr == "D2C") iEntry= GNSSENTRY_D2CDATA;156 else if (rnxStr == "D2P") iEntry= GNSSENTRY_D2PDATA;157 else if (rnxStr == "S2C") iEntry= GNSSENTRY_S2CDATA;158 else if (rnxStr == "S2P") iEntry= GNSSENTRY_S2PDATA;153 if (rnxStr == "C1C") retVal = GNSSENTRY_C1DATA; 154 else if (rnxStr == "C1P") retVal = GNSSENTRY_P1DATA; 155 else if (rnxStr == "L1C") retVal = GNSSENTRY_L1CDATA; 156 else if (rnxStr == "L1P") retVal = GNSSENTRY_L1PDATA; 157 else if (rnxStr == "D1C") retVal = GNSSENTRY_D1CDATA; 158 else if (rnxStr == "D1P") retVal = GNSSENTRY_D1PDATA; 159 else if (rnxStr == "S1C") retVal = GNSSENTRY_S1CDATA; 160 else if (rnxStr == "S1P") retVal = GNSSENTRY_S1PDATA; 161 162 else if (rnxStr == "C2C") retVal = GNSSENTRY_C2DATA; 163 else if (rnxStr == "C2P") retVal = GNSSENTRY_P2DATA; 164 else if (rnxStr == "L2C") retVal = GNSSENTRY_L2CDATA; 165 else if (rnxStr == "L2P") retVal = GNSSENTRY_L2PDATA; 166 else if (rnxStr == "D2C") retVal = GNSSENTRY_D2CDATA; 167 else if (rnxStr == "D2P") retVal = GNSSENTRY_D2PDATA; 168 else if (rnxStr == "S2C") retVal = GNSSENTRY_S2CDATA; 169 else if (rnxStr == "S2P") retVal = GNSSENTRY_S2PDATA; 159 170 } 160 171 … … 162 173 // ------- 163 174 else if (satSys == 'E') { 164 if (rnxStr == "C1") iEntry= GNSSENTRY_C1DATA;165 else if (rnxStr == "L1") iEntry= GNSSENTRY_L1CDATA;166 else if (rnxStr == "D1") iEntry= GNSSENTRY_D1CDATA;167 else if (rnxStr == "S1") iEntry= GNSSENTRY_S1CDATA;168 169 else if (rnxStr == "C5") iEntry= GNSSENTRY_C5DATA;170 else if (rnxStr == "L5") iEntry= GNSSENTRY_L5DATA;171 else if (rnxStr == "D5") iEntry= GNSSENTRY_D5DATA;172 else if (rnxStr == "S5") iEntry= GNSSENTRY_S5DATA;173 else if (rnxStr == "C6") iEntry= GNSSENTRY_C6DATA;174 175 else if (rnxStr == "L6") iEntry= GNSSENTRY_L6DATA;176 else if (rnxStr == "D6") iEntry= GNSSENTRY_D6DATA;177 else if (rnxStr == "S6") iEntry= GNSSENTRY_S6DATA;178 179 else if (rnxStr == "C7") iEntry= GNSSENTRY_C5BDATA;180 else if (rnxStr == "L7") iEntry= GNSSENTRY_L5BDATA;181 else if (rnxStr == "D7") iEntry= GNSSENTRY_D5BDATA;182 else if (rnxStr == "S7") iEntry= GNSSENTRY_S5BDATA;183 184 else if (rnxStr == "C8") iEntry= GNSSENTRY_C5ABDATA;185 else if (rnxStr == "L8") iEntry= GNSSENTRY_L5ABDATA;186 else if (rnxStr == "D8") iEntry= GNSSENTRY_D5ABDATA;187 else if (rnxStr == "S8") iEntry= GNSSENTRY_S5ABDATA;175 if (rnxStr == "C1") retVal = GNSSENTRY_C1DATA; 176 else if (rnxStr == "L1") retVal = GNSSENTRY_L1CDATA; 177 else if (rnxStr == "D1") retVal = GNSSENTRY_D1CDATA; 178 else if (rnxStr == "S1") retVal = GNSSENTRY_S1CDATA; 179 180 else if (rnxStr == "C5") retVal = GNSSENTRY_C5DATA; 181 else if (rnxStr == "L5") retVal = GNSSENTRY_L5DATA; 182 else if (rnxStr == "D5") retVal = GNSSENTRY_D5DATA; 183 else if (rnxStr == "S5") retVal = GNSSENTRY_S5DATA; 184 else if (rnxStr == "C6") retVal = GNSSENTRY_C6DATA; 185 186 else if (rnxStr == "L6") retVal = GNSSENTRY_L6DATA; 187 else if (rnxStr == "D6") retVal = GNSSENTRY_D6DATA; 188 else if (rnxStr == "S6") retVal = GNSSENTRY_S6DATA; 189 190 else if (rnxStr == "C7") retVal = GNSSENTRY_C5BDATA; 191 else if (rnxStr == "L7") retVal = GNSSENTRY_L5BDATA; 192 else if (rnxStr == "D7") retVal = GNSSENTRY_D5BDATA; 193 else if (rnxStr == "S7") retVal = GNSSENTRY_S5BDATA; 194 195 else if (rnxStr == "C8") retVal = GNSSENTRY_C5ABDATA; 196 else if (rnxStr == "L8") retVal = GNSSENTRY_L5ABDATA; 197 else if (rnxStr == "D8") retVal = GNSSENTRY_D5ABDATA; 198 else if (rnxStr == "S8") retVal = GNSSENTRY_S5ABDATA; 188 199 } 189 200 … … 191 202 // ---- 192 203 else if (satSys == 'J') { 193 if (rnxStr == "C1" ) iEntry= GNSSENTRY_C1NDATA;194 else if (rnxStr == "C1C") iEntry= GNSSENTRY_C1DATA;195 else if (rnxStr == "C1Z") iEntry= GNSSENTRY_CSAIFDATA;196 else if (rnxStr == "L1" ) iEntry= GNSSENTRY_L1NDATA;197 else if (rnxStr == "L1C") iEntry= GNSSENTRY_L1CDATA;198 else if (rnxStr == "L1Z") iEntry= GNSSENTRY_LSAIFDATA;199 else if (rnxStr == "D1" ) iEntry= GNSSENTRY_D1NDATA;200 else if (rnxStr == "D1C") iEntry= GNSSENTRY_D1CDATA;201 else if (rnxStr == "D1Z") iEntry= GNSSENTRY_DSAIFDATA;202 else if (rnxStr == "S1" ) iEntry= GNSSENTRY_S1NDATA;203 else if (rnxStr == "S1C") iEntry= GNSSENTRY_S1CDATA;204 else if (rnxStr == "S1Z") iEntry= GNSSENTRY_SSAIFDATA;205 206 else if (rnxStr == "C2" ) iEntry= GNSSENTRY_C2DATA;207 else if (rnxStr == "L2" ) iEntry= GNSSENTRY_L2CDATA;208 else if (rnxStr == "D2" ) iEntry= GNSSENTRY_D2CDATA;209 else if (rnxStr == "S2" ) iEntry= GNSSENTRY_S2CDATA;210 211 else if (rnxStr == "C5" ) iEntry= GNSSENTRY_C5DATA;212 else if (rnxStr == "L5" ) iEntry= GNSSENTRY_L5DATA;213 else if (rnxStr == "D5" ) iEntry= GNSSENTRY_D5DATA;214 else if (rnxStr == "S5" ) iEntry= GNSSENTRY_S5DATA;215 216 else if (rnxStr == "C6" ) iEntry= GNSSENTRY_C6DATA;217 else if (rnxStr == "D6" ) iEntry= GNSSENTRY_D6DATA;218 else if (rnxStr == "L6" ) iEntry= GNSSENTRY_L6DATA;219 else if (rnxStr == "S6" ) iEntry= GNSSENTRY_S6DATA;204 if (rnxStr == "C1" ) retVal = GNSSENTRY_C1NDATA; 205 else if (rnxStr == "C1C") retVal = GNSSENTRY_C1DATA; 206 else if (rnxStr == "C1Z") retVal = GNSSENTRY_CSAIFDATA; 207 else if (rnxStr == "L1" ) retVal = GNSSENTRY_L1NDATA; 208 else if (rnxStr == "L1C") retVal = GNSSENTRY_L1CDATA; 209 else if (rnxStr == "L1Z") retVal = GNSSENTRY_LSAIFDATA; 210 else if (rnxStr == "D1" ) retVal = GNSSENTRY_D1NDATA; 211 else if (rnxStr == "D1C") retVal = GNSSENTRY_D1CDATA; 212 else if (rnxStr == "D1Z") retVal = GNSSENTRY_DSAIFDATA; 213 else if (rnxStr == "S1" ) retVal = GNSSENTRY_S1NDATA; 214 else if (rnxStr == "S1C") retVal = GNSSENTRY_S1CDATA; 215 else if (rnxStr == "S1Z") retVal = GNSSENTRY_SSAIFDATA; 216 217 else if (rnxStr == "C2" ) retVal = GNSSENTRY_C2DATA; 218 else if (rnxStr == "L2" ) retVal = GNSSENTRY_L2CDATA; 219 else if (rnxStr == "D2" ) retVal = GNSSENTRY_D2CDATA; 220 else if (rnxStr == "S2" ) retVal = GNSSENTRY_S2CDATA; 221 222 else if (rnxStr == "C5" ) retVal = GNSSENTRY_C5DATA; 223 else if (rnxStr == "L5" ) retVal = GNSSENTRY_L5DATA; 224 else if (rnxStr == "D5" ) retVal = GNSSENTRY_D5DATA; 225 else if (rnxStr == "S5" ) retVal = GNSSENTRY_S5DATA; 226 227 else if (rnxStr == "C6" ) retVal = GNSSENTRY_C6DATA; 228 else if (rnxStr == "D6" ) retVal = GNSSENTRY_D6DATA; 229 else if (rnxStr == "L6" ) retVal = GNSSENTRY_L6DATA; 230 else if (rnxStr == "S6" ) retVal = GNSSENTRY_S6DATA; 220 231 } 221 232 … … 223 234 // ---- 224 235 else if (satSys == 'S') { 225 if (rnxStr == "C1C") iEntry= GNSSENTRY_C1DATA;226 else if (rnxStr == "C1W") iEntry= GNSSENTRY_P1DATA;227 else if (rnxStr == "L1C") iEntry= GNSSENTRY_L1CDATA;228 else if (rnxStr == "L1W") iEntry= GNSSENTRY_L1PDATA;229 else if (rnxStr == "D1C") iEntry= GNSSENTRY_D1CDATA;230 else if (rnxStr == "D1W") iEntry= GNSSENTRY_D1PDATA;231 else if (rnxStr == "S1C") iEntry= GNSSENTRY_S1CDATA;232 else if (rnxStr == "S1W") iEntry= GNSSENTRY_S1PDATA;233 234 else if (rnxStr == "C5" ) iEntry= GNSSENTRY_C5DATA;235 else if (rnxStr == "L5" ) iEntry= GNSSENTRY_L5DATA;236 else if (rnxStr == "D5" ) iEntry= GNSSENTRY_D5DATA;237 else if (rnxStr == "S5" ) iEntry= GNSSENTRY_S5DATA;236 if (rnxStr == "C1C") retVal = GNSSENTRY_C1DATA; 237 else if (rnxStr == "C1W") retVal = GNSSENTRY_P1DATA; 238 else if (rnxStr == "L1C") retVal = GNSSENTRY_L1CDATA; 239 else if (rnxStr == "L1W") retVal = GNSSENTRY_L1PDATA; 240 else if (rnxStr == "D1C") retVal = GNSSENTRY_D1CDATA; 241 else if (rnxStr == "D1W") retVal = GNSSENTRY_D1PDATA; 242 else if (rnxStr == "S1C") retVal = GNSSENTRY_S1CDATA; 243 else if (rnxStr == "S1W") retVal = GNSSENTRY_S1PDATA; 244 245 else if (rnxStr == "C5" ) retVal = GNSSENTRY_C5DATA; 246 else if (rnxStr == "L5" ) retVal = GNSSENTRY_L5DATA; 247 else if (rnxStr == "D5" ) retVal = GNSSENTRY_D5DATA; 248 else if (rnxStr == "S5" ) retVal = GNSSENTRY_S5DATA; 238 249 } 239 250 … … 241 252 // ------- 242 253 else if (satSys == 'C') { 243 if (rnxStr == "C2I") iEntry = GNSSENTRY_CB1DATA; 244 else if (rnxStr == "L2I") iEntry = GNSSENTRY_LB1DATA; 245 else if (rnxStr == "D2I") iEntry = GNSSENTRY_DB1DATA; 246 else if (rnxStr == "S2I") iEntry = GNSSENTRY_SB1DATA; 247 248 else if (rnxStr == "C6I") iEntry = GNSSENTRY_CB3DATA; 249 else if (rnxStr == "L6I") iEntry = GNSSENTRY_LB3DATA; 250 else if (rnxStr == "D6I") iEntry = GNSSENTRY_DB3DATA; 251 else if (rnxStr == "S6I") iEntry = GNSSENTRY_SB3DATA; 252 253 else if (rnxStr == "C7I") iEntry = GNSSENTRY_CB2DATA; 254 else if (rnxStr == "L7I") iEntry = GNSSENTRY_LB2DATA; 255 else if (rnxStr == "D7I") iEntry = GNSSENTRY_DB2DATA; 256 else if (rnxStr == "S7I") iEntry = GNSSENTRY_SB2DATA; 257 } 258 259 // Set iEntry pointer if required 260 // ------------------------------ 261 if (p_iEntry) { 262 *p_iEntry = iEntry; 263 } 264 265 // Return the value if found 266 // ------------------------- 267 if (iEntry != -1) { 268 return _measdata[iEntry]; 269 } 270 else { 271 return 0.0; 272 } 273 } 274 254 if (rnxStr == "C2I") retVal = GNSSENTRY_CB1DATA; 255 else if (rnxStr == "L2I") retVal = GNSSENTRY_LB1DATA; 256 else if (rnxStr == "D2I") retVal = GNSSENTRY_DB1DATA; 257 else if (rnxStr == "S2I") retVal = GNSSENTRY_SB1DATA; 258 259 else if (rnxStr == "C6I") retVal = GNSSENTRY_CB3DATA; 260 else if (rnxStr == "L6I") retVal = GNSSENTRY_LB3DATA; 261 else if (rnxStr == "D6I") retVal = GNSSENTRY_DB3DATA; 262 else if (rnxStr == "S6I") retVal = GNSSENTRY_SB3DATA; 263 264 else if (rnxStr == "C7I") retVal = GNSSENTRY_CB2DATA; 265 else if (rnxStr == "L7I") retVal = GNSSENTRY_LB2DATA; 266 else if (rnxStr == "D7I") retVal = GNSSENTRY_DB2DATA; 267 else if (rnxStr == "S7I") retVal = GNSSENTRY_SB2DATA; 268 } 269 270 return retVal; 271 } 272 -
trunk/BNC/src/RTCM/GPSDecoder.h
r4393 r4403 50 50 _dataflags = 0; 51 51 _dataflags2 = 0; 52 for (int i Entry = 0; iEntry < GNSSENTRY_NUMBER; iEntry++) {53 _measdata[i Entry] = 0.0;54 _codetype[i Entry] = 0;52 for (int ie = 0; ie < GNSSENTRY_NUMBER; ie++) { 53 _measdata[ie] = 0.0; 54 _codetype[ie] = 0; 55 55 } 56 56 slip_cnt_L1 = -1; … … 61 61 ~t_obs() {} 62 62 63 double measdata(const QString& rnxStr, int* iEntry = 0) const;64 void setMeasdata(const QString& rnxStr, double value);63 double measdata(const QString& rnxStr, float rnxVer) const; 64 void setMeasdata(const QString& rnxStr, float rnxVer, double value); 65 65 66 66 char StatID[20+1]; // Station ID … … 79 79 unsigned int _dataflags2; // GNSSDF2_xxx */ 80 80 const char* _codetype[GNSSENTRY_NUMBER]; 81 82 private: 83 int iEntry(const QString& rnxStr, float rnxVer) const; 81 84 }; 82 85 -
trunk/BNC/src/RTCM/RTCM2Decoder.cpp
r4391 r4403 148 148 obs.GPSWeek = epochWeek; 149 149 obs.GPSWeeks = epochSecs; 150 obs.setMeasdata("C1", _ObsBlock.rng_C1[iSat]);151 obs.setMeasdata("P1", _ObsBlock.rng_P1[iSat]);152 obs.setMeasdata("P2", _ObsBlock.rng_P2[iSat]);153 obs.setMeasdata("L1", _ObsBlock.resolvedPhase_L1(iSat));154 obs.setMeasdata("L2", _ObsBlock.resolvedPhase_L2(iSat));150 obs.setMeasdata("C1", 2.0, _ObsBlock.rng_C1[iSat]); 151 obs.setMeasdata("P1", 2.0, _ObsBlock.rng_P1[iSat]); 152 obs.setMeasdata("P2", 2.0, _ObsBlock.rng_P2[iSat]); 153 obs.setMeasdata("L1", 2.0, _ObsBlock.resolvedPhase_L1(iSat)); 154 obs.setMeasdata("L2", 2.0, _ObsBlock.resolvedPhase_L2(iSat)); 155 155 obs.slip_cnt_L1 = _ObsBlock.slip_L1[iSat]; 156 156 obs.slip_cnt_L2 = _ObsBlock.slip_L2[iSat]; … … 368 368 switch (ii) { 369 369 case 0: // --- L1 --- 370 new_obs->setMeasdata("L1", *obsVal / LAMBDA_1);370 new_obs->setMeasdata("L1", 2.0, *obsVal / LAMBDA_1); 371 371 new_obs->slip_cnt_L1 = corr->lock1; 372 372 break; 373 373 case 1: // --- L2 --- 374 new_obs->setMeasdata("L2", *obsVal / LAMBDA_2);374 new_obs->setMeasdata("L2", 2.0, *obsVal / LAMBDA_2); 375 375 new_obs->slip_cnt_L2 = corr->lock2; 376 376 break; 377 377 case 2: // --- C1 / P1 --- 378 378 if ( corr->Pind1 ) 379 new_obs->setMeasdata("P1", *obsVal);379 new_obs->setMeasdata("P1", 2.0, *obsVal); 380 380 else 381 new_obs->setMeasdata("C1", *obsVal);381 new_obs->setMeasdata("C1", 2.0, *obsVal); 382 382 break; 383 383 case 3: // --- C2 / P2 --- 384 384 if ( corr->Pind2 ) 385 new_obs->setMeasdata("P2", *obsVal);385 new_obs->setMeasdata("P2", 2.0, *obsVal); 386 386 else 387 new_obs->setMeasdata("C2", *obsVal);387 new_obs->setMeasdata("C2", 2.0, *obsVal); 388 388 break; 389 389 default:
Note:
See TracChangeset
for help on using the changeset viewer.
