Index: /trunk/Mars/mcore/fits.h =================================================================== --- /trunk/Mars/mcore/fits.h (revision 17259) +++ /trunk/Mars/mcore/fits.h (revision 17260) @@ -48,6 +48,4 @@ namespace std { -#else -using namespace std; #endif @@ -65,8 +63,8 @@ struct Entry { - char type; - string value; - string comment; - string fitsString; + char type; + std::string value; + std::string comment; + std::string fitsString; template @@ -75,5 +73,5 @@ T t; - istringstream str(value); + std::istringstream str(value); str >> t; @@ -88,5 +86,5 @@ bool is_compressed; - string name; + std::string name; size_t bytes_per_row; size_t num_rows; @@ -101,11 +99,11 @@ size_t bytes; // num*size char type; - string unit; + std::string unit; Compression_t comp; }; - typedef map Keys; - typedef map Columns; - typedef vector SortedColumns; + typedef std::map Keys; + typedef std::map Columns; + typedef std::vector SortedColumns; Columns cols; @@ -115,5 +113,5 @@ int64_t datasum; - string Trim(const string &str, char c=' ') const + std::string Trim(const std::string &str, char c=' ') const { // Trim Both leading and trailing spaces @@ -122,19 +120,19 @@ // if all spaces or empty return an empty string - if (string::npos==pstart || string::npos==pend) - return string(); + if (std::string::npos==pstart || std::string::npos==pend) + return std::string(); return str.substr(pstart, pend-pstart+1); } - bool Check(const string &key, char type, const string &value="") const + bool Check(const std::string &key, char type, const std::string &value="") const { const Keys::const_iterator it = keys.find(key); if (it==keys.end()) { - ostringstream str; + std::ostringstream str; str << "Key '" << key << "' not found."; #ifdef __EXCEPTIONS - throw runtime_error(str.str()); + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -145,8 +143,8 @@ if (it->second.type!=type) { - ostringstream str; + std::ostringstream str; str << "Wrong type for key '" << key << "': expected " << type << ", found " << it->second.type << "."; #ifdef __EXCEPTIONS - throw runtime_error(str.str()); + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -157,8 +155,8 @@ if (!value.empty() && it->second.value!=value) { - ostringstream str; + std::ostringstream str; str << "Wrong value for key '" << key << "': expected " << value << ", found " << it->second.value << "."; #ifdef __EXCEPTIONS - throw runtime_error(str.str()); + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -170,11 +168,11 @@ } - Keys ParseBlock(const vector &vec) const - { - map rc; + Keys ParseBlock(const std::vector &vec) const + { + std::map rc; for (unsigned int i=0; i &vec, off_t off) : offset(off), + Table(const std::vector &vec, off_t off) : offset(off), keys(ParseBlock(vec)) { @@ -270,8 +268,8 @@ size_t bytes = 0; - const string tFormName = is_compressed ? "ZFORM" : "TFORM"; + const std::string tFormName = is_compressed ? "ZFORM" : "TFORM"; for (long long unsigned int i=1; i<=num_cols; i++) { - const string num(to_string(i)); + const std::string num(std::to_string(i)); if (!Check("TTYPE"+num, 'T') || @@ -279,8 +277,8 @@ return; - const string id = Get("TTYPE"+num); - const string fmt = Get(tFormName+num); - const string unit = Get("TUNIT"+num, ""); - const string comp = Get("ZCTYP"+num, ""); + const std::string id = Get("TTYPE"+num); + const std::string fmt = Get(tFormName+num); + const std::string unit = Get("TUNIT"+num, ""); + const std::string comp = Get("ZCTYP"+num, ""); Compression_t compress = kCompUnknown; @@ -288,5 +286,5 @@ compress = kCompFACT; - istringstream sin(fmt); + std::istringstream sin(fmt); int n = 0; sin >> n; @@ -316,8 +314,8 @@ default: { - ostringstream str; + std::ostringstream str; str << "FITS format TFORM='" << fmt << "' not yet supported."; #ifdef __EXCEPTIONS - throw runtime_error(str.str()); + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -337,5 +335,5 @@ { #ifdef __EXCEPTIONS - throw runtime_error("Column size mismatch"); + throw std::runtime_error("Column size mismatch"); #else gLog << ___err___ << "ERROR - Column size mismatch" << endl; @@ -344,10 +342,10 @@ } - name = Get("EXTNAME"); + name = Get("EXTNAME"); } void PrintKeys(bool display_all=false) const { - for (Keys::const_iterator it=keys.begin(); it!=keys.end(); it++) + for (Keys::const_iterator it=keys.cbegin(); it!=keys.cend(); it++) { if (!display_all && @@ -369,12 +367,12 @@ void PrintColumns() const { - typedef map, Column> Sorted; + typedef std::map, Column> Sorted; Sorted sorted; - for (Columns::const_iterator it=cols.begin(); it!=cols.end(); it++) - sorted[make_pair(it->second.offset, it->first)] = it->second; - - for (Sorted::const_iterator it=sorted.begin(); it!=sorted.end(); it++) + for (Columns::const_iterator it=cols.cbegin(); it!=cols.cend(); it++) + sorted[std::make_pair(it->second.offset, it->first)] = it->second; + + for (Sorted::const_iterator it=sorted.cbegin(); it!=sorted.cend(); it++) { gLog << ___all___ << setw(6) << it->second.offset << "| "; @@ -397,10 +395,10 @@ operator bool() const { return !name.empty(); } - bool HasKey(const string &key) const + bool HasKey(const std::string &key) const { return keys.find(key)!=keys.end(); } - bool HasColumn(const string& col) const + bool HasColumn(const std::string& col) const { return cols.find(col)!=cols.end(); @@ -419,13 +417,13 @@ // Values of keys are always signed template - T Get(const string &key) const - { - const map::const_iterator it = keys.find(key); + T Get(const std::string &key) const + { + const std::map::const_iterator it = keys.find(key); if (it==keys.end()) { - ostringstream str; - str << "Key '" << key << "' not found." << endl; -#ifdef __EXCEPTIONS - throw runtime_error(str.str()); + std::ostringstream str; + str << "Key '" << key << "' not found."; +#ifdef __EXCEPTIONS + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -438,11 +436,11 @@ // Values of keys are always signed template - T Get(const string &key, const T &deflt) const - { - const map::const_iterator it = keys.find(key); + T Get(const std::string &key, const T &deflt) const + { + const std::map::const_iterator it = keys.find(key); return it==keys.end() ? deflt :it->second.Get(); } - size_t GetN(const string &key) const + size_t GetN(const std::string &key) const { const Columns::const_iterator it = cols.find(key); @@ -485,24 +483,24 @@ protected: - ofstream fCopy; + std::ofstream fCopy; Table fTable; - typedef pair Address; - typedef vector
Addresses; + typedef std::pair Address; + typedef std::vector
Addresses; //map fAddresses; Addresses fAddresses; #if defined(__MARS__) || defined(__CINT__) - typedef map Pointers; -#else - typedef unordered_map Pointers; + typedef std::map Pointers; +#else + typedef std::unordered_map Pointers; #endif Pointers fPointers; - vector> fGarbage; - - vector fBufferRow; - vector fBufferDat; + std::vector> fGarbage; + + std::vector fBufferRow; + std::vector fBufferDat; size_t fRow; @@ -511,5 +509,5 @@ Checksum fChkData; - bool ReadBlock(vector &vec) + bool ReadBlock(std::vector &vec) { int endtag = 0; @@ -527,5 +525,5 @@ // return vector(); - string str(c); + std::string str(c); // if (!str.empty()) @@ -554,12 +552,7 @@ } - string Compile(const string &key, int16_t i=-1) const - { - if (i<0) - return key; - - ostringstream str; - str << key << i; - return str.str(); + std::string Compile(const std::string &key, int16_t i=-1) const + { + return i<0 ? key : key+std::to_string(i); } @@ -577,5 +570,5 @@ clear(rdstate()|ios::badbit); #ifdef __EXCEPTIONS - throw runtime_error("File is not a FITS file."); + throw std::runtime_error("File is not a FITS file."); #else gLog << ___err___ << "ERROR - File is not a FITS file." << endl; @@ -588,5 +581,5 @@ while (good()) { - vector block; + std::vector block; while (1) { @@ -605,5 +598,5 @@ clear(rdstate()|ios::badbit); #ifdef __EXCEPTIONS - throw runtime_error("FITS file corrupted."); + throw std::runtime_error("FITS file corrupted."); #else gLog << ___err___ << "ERROR - FITS file corrupted." << endl; @@ -618,5 +611,5 @@ clear(rdstate()|ios::badbit); #ifdef __EXCEPTIONS - throw runtime_error("END keyword missing in FITS header."); + throw std::runtime_error("END keyword missing in FITS header."); #else gLog << ___err___ << "ERROR - END keyword missing in FITS file... file might be corrupted." << endl; @@ -691,5 +684,5 @@ clear(rdstate()|ios::badbit); #ifdef __EXCEPTIONS - throw runtime_error("Could not open output file."); + throw std::runtime_error("Could not open output file."); #else gLog << ___err___ << "ERROR - Failed to open output file." << endl; @@ -700,5 +693,5 @@ seekg(0); - vector buf(p); + std::vector buf(p); read(buf.data(), p); @@ -709,5 +702,5 @@ public: - fits(const string &fname, const string& tableName="", bool force=false) : izstream(fname.c_str()) + fits(const std::string &fname, const std::string& tableName="", bool force=false) : izstream(fname.c_str()) { Constructor(fname, "", tableName, force); @@ -716,5 +709,5 @@ { #ifdef __EXCEPTIONS - throw runtime_error("You are trying to read a compressed fits with the base fits class. Please use factfits instead."); + throw std::runtime_error("You are trying to read a compressed fits with the base fits class. Please use factfits instead."); #else gLog << ___err___ << "ERROR - You are trying to read a compressed fits with the base fits class. Please use factfits instead." << endl; @@ -724,5 +717,5 @@ } - fits(const string &fname, const string &fout, const string& tableName, bool force=false) : izstream(fname.c_str()) + fits(const std::string &fname, const std::string &fout, const std::string& tableName, bool force=false) : izstream(fname.c_str()) { Constructor(fname, fout, tableName, force); @@ -731,5 +724,5 @@ { #ifdef __EXCEPTIONS - throw runtime_error("You are trying to read a compressed fits with the base fits class. Please use factfits instead."); + throw std::runtime_error("You are trying to read a compressed fits with the base fits class. Please use factfits instead."); #else gLog << ___err___ << "ERROR - You are trying to read a compressed fits with the base fits class. Please use factfits instead." << endl; @@ -746,7 +739,7 @@ ~fits() { - copy(istreambuf_iterator(*this), - istreambuf_iterator(), - ostreambuf_iterator(fCopy)); + std::copy(std::istreambuf_iterator(*this), + std::istreambuf_iterator(), + std::ostreambuf_iterator(fCopy)); } @@ -776,5 +769,5 @@ } - void ZeroBufferForChecksum(vector& vec, const uint64_t extraZeros=0) + void ZeroBufferForChecksum(std::vector& vec, const uint64_t extraZeros=0) { auto ib = vec.begin(); @@ -842,5 +835,5 @@ const char *ptr = fBufferRow.data() + offset; - for (Addresses::const_iterator it=fAddresses.begin(); it!=fAddresses.end(); it++) + for (Addresses::const_iterator it=fAddresses.cbegin(); it!=fAddresses.cend(); it++) { const Table::Column &c = it->second; @@ -876,17 +869,17 @@ template - const T &GetAs(const string &name) + const T &GetAs(const std::string &name) { return *reinterpret_cast(fPointers[name]); } - void *SetPtrAddress(const string &name) + void *SetPtrAddress(const std::string &name) { if (fTable.cols.count(name)==0) { - ostringstream str; - str << "SetPtrAddress('" << name << "') - Column not found." << endl; -#ifdef __EXCEPTIONS - throw runtime_error(str.str()); + std::ostringstream str; + str << "SetPtrAddress('" << name << "') - Column not found."; +#ifdef __EXCEPTIONS + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -910,12 +903,12 @@ template - bool SetPtrAddress(const string &name, T *ptr, size_t cnt) + bool SetPtrAddress(const std::string &name, T *ptr, size_t cnt) { if (fTable.cols.count(name)==0) { - ostringstream str; - str << "SetPtrAddress('" << name << "') - Column not found." << endl; -#ifdef __EXCEPTIONS - throw runtime_error(str.str()); + std::ostringstream str; + str << "SetPtrAddress('" << name << "') - Column not found."; +#ifdef __EXCEPTIONS + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -926,9 +919,9 @@ if (sizeof(T)!=fTable.cols[name].size) { - ostringstream str; + std::ostringstream str; str << "SetPtrAddress('" << name << "') - Element size mismatch: expected " - << fTable.cols[name].size << " from header, got " << sizeof(T) << endl; -#ifdef __EXCEPTIONS - throw runtime_error(str.str()); + << fTable.cols[name].size << " from header, got " << sizeof(T); +#ifdef __EXCEPTIONS + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -939,9 +932,9 @@ if (cnt!=fTable.cols[name].num) { - ostringstream str; + std::ostringstream str; str << "SetPtrAddress('" << name << "') - Element count mismatch: expected " - << fTable.cols[name].num << " from header, got " << cnt << endl; -#ifdef __EXCEPTIONS - throw runtime_error(str.str()); + << fTable.cols[name].num << " from header, got " << cnt; +#ifdef __EXCEPTIONS + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -961,5 +954,5 @@ template - bool SetRefAddress(const string &name, T &ptr) + bool SetRefAddress(const std::string &name, T &ptr) { return SetPtrAddress(name, &ptr, sizeof(ptr)/sizeof(T)); @@ -967,5 +960,5 @@ template - bool SetVecAddress(const string &name, vector &vec) + bool SetVecAddress(const std::string &name, std::vector &vec) { return SetPtrAddress(name, vec.data(), vec.size()); @@ -973,5 +966,5 @@ template - T Get(const string &key) const + T Get(const std::string &key) const { return fTable.Get(key); @@ -979,17 +972,17 @@ template - T Get(const string &key, const string &deflt) const + T Get(const std::string &key, const std::string &deflt) const { return fTable.Get(key, deflt); } - bool SetPtrAddress(const string &name, void *ptr, size_t cnt=0) + bool SetPtrAddress(const std::string &name, void *ptr, size_t cnt=0) { if (fTable.cols.count(name)==0) { - ostringstream str; - str <<"SetPtrAddress('" << name << "') - Column not found." << endl; -#ifdef __EXCEPTIONS - throw runtime_error(str.str()); + std::ostringstream str; + str <<"SetPtrAddress('" << name << "') - Column not found."; +#ifdef __EXCEPTIONS + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -1000,9 +993,9 @@ if (cnt && cnt!=fTable.cols[name].num) { - ostringstream str; + std::ostringstream str; str << "SetPtrAddress('" << name << "') - Element count mismatch: expected " - << fTable.cols[name].num << " from header, got " << cnt << endl; -#ifdef __EXCEPTIONS - throw runtime_error(str.str()); + << fTable.cols[name].num << " from header, got " << cnt; +#ifdef __EXCEPTIONS + throw std::runtime_error(str.str()); #else gLog << ___err___ << "ERROR - " << str.str() << endl; @@ -1021,16 +1014,16 @@ } - bool HasKey(const string &key) const { return fTable.HasKey(key); } - bool HasColumn(const string& col) const { return fTable.HasColumn(col);} + bool HasKey(const std::string &key) const { return fTable.HasKey(key); } + bool HasColumn(const std::string& col) const { return fTable.HasColumn(col);} const Table::Columns &GetColumns() const { return fTable.GetColumns();} const Table::SortedColumns& GetSortedColumns() const { return fTable.sorted_cols;} const Table::Keys &GetKeys() const { return fTable.GetKeys();} - int64_t GetInt(const string &key) const { return fTable.Get(key); } - uint64_t GetUInt(const string &key) const { return fTable.Get(key); } - double GetFloat(const string &key) const { return fTable.Get(key); } - string GetStr(const string &key) const { return fTable.Get(key); } - - size_t GetN(const string &key) const + int64_t GetInt(const std::string &key) const { return fTable.Get(key); } + uint64_t GetUInt(const std::string &key) const { return fTable.Get(key); } + double GetFloat(const std::string &key) const { return fTable.Get(key); } + std::string GetStr(const std::string &key) const { return fTable.Get(key); } + + size_t GetN(const std::string &key) const { return fTable.GetN(key);