casa6
Public
Commits
| 161 161 | os << LogIO::NORMAL << "No matching antenna response found for observatory " |
| 162 162 | << obsName_p << LogIO::POST; |
| 163 163 | useInternal = true; |
| 164 164 | } |
| 165 165 | } |
| 166 166 | |
| 167 167 | if(useInternal){ |
| 168 168 | |
| 169 169 | Bool found = False; |
| 170 170 | String fullFileName; |
| 171 - | |
| 172 - | |
| 173 - | std::list<std::string> data_path={"/opt/casa/data/master", "/opt/casa/data/casatestdata"}; |
| 174 - | const std::string distrodata_path ="/opt/casa/data/master"; |
| 171 + | const std::list<std::string> &data_path = AppStateSource::fetch( ).dataPath( ); |
| 172 + | const std::string distrodata_path =casatools::get_state().distroDataPath( ); |
| 175 173 | //cerr<<"distrodata_path="<<distrodata_path<<endl; |
| 176 174 | //cerr<<"DATA PATH==="<< *data_path <<endl; |
| 177 175 | // The data path search need to be rewritten to adopt the recommanded setting via python |
| 178 176 | // file for CASA6. |
| 179 177 | // For now, only the first path that actually exist will be set to the data path (TT 2018.12.10) |
| 180 178 | if (data_path.size() > 0 ) { |
| 181 179 | for ( std::list<std::string>::const_iterator it=data_path.begin(); ! found && it != data_path.end(); ++it ) { |
| 182 180 | Path lpath = Path(*it); |
| 183 181 | //os<<"Here to datapath="<<lpath<<LogIO::POST; |
| 184 182 | //Path lpath = Path(data_path); |