Changeset 11461
- Timestamp:
- 07/19/11 11:13:33 (13 years ago)
- Location:
- trunk/Mars
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Mars/Changelog
r11460 r11461 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2011/07/19 Thomas Bretz 22 23 * mbase/MFits.h: 24 - made struct Entry public (needed by newer root versions) 25 26 20 27 21 28 2011/07/18 Thomas Bretz -
trunk/Mars/mbase/MFits.h
r11450 r11461 33 33 class MFits : public MZlib 34 34 { 35 public: 35 36 struct Entry 36 37 { … … 51 52 }; 52 53 53 vector<string> ReadBlock(vector<string> &vec)54 {55 bool end = false;56 for (int i=0; i<36; i++)57 {58 char c[81];59 c[80] = 0;60 read(c, 80);61 if (!good())62 break;63 64 if (c[0]==0)65 return vector<string>();66 67 string str(c);68 69 //if (!str.empty())70 // cout << setw(2) << i << "|" << str << "|" << endl;71 72 if (str=="END ")73 end = true;74 75 if (end)76 continue;77 78 vec.push_back(str);79 }80 81 return vec;82 }83 84 public:85 54 struct Table 86 55 { … … 332 301 size_t fRow; 333 302 303 vector<string> ReadBlock(vector<string> &vec) 304 { 305 bool end = false; 306 for (int i=0; i<36; i++) 307 { 308 char c[81]; 309 c[80] = 0; 310 read(c, 80); 311 if (!good()) 312 break; 313 314 if (c[0]==0) 315 return vector<string>(); 316 317 string str(c); 318 319 //if (!str.empty()) 320 // cout << setw(2) << i << "|" << str << "|" << endl; 321 322 if (str=="END ") 323 end = true; 324 325 if (end) 326 continue; 327 328 vec.push_back(str); 329 } 330 331 return vec; 332 } 333 334 334 string Compile(const string &key, int16_t i=-1) 335 335 {
Note:
See TracChangeset
for help on using the changeset viewer.