Skip to content

updates jv2 journal location url to http://journals.isis.cclrc.ac.uk/jv/ #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akintomiwa wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

updates jv2 journal location url to http://journals.isis.cclrc.ac.uk/jv/ #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/Pages/3.operation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ docroot: /jv2/docs
header_class: alt
---

While local to each 'NDH' instrument computer, the journal files for every beamline are also mirrored to a network filestore location (http://data.isis.rl.ac.uk/journals). It is these files that **JV2** reads from the network, parses, and displays, as its primary function. This means that, while on the local network (potentially via VPN) every stored journal file for every beamline is available within **JV2** from any computer. Moreover, if the location of the ISIS data archive is set, **JV2** will also be able to plot block value data from any run file detailed within the journal. **JV2** can be configured to read from local sources, meaning basic run information can be viewed even when off-site (without VPN) or offline when files are available.
While local to each 'NDH' instrument computer, the journal files for every beamline are also mirrored to a network filestore location (http://journals.isis.cclrc.ac.uk/jv/). It is these files that **JV2** reads from the network, parses, and displays, as its primary function. This means that, while on the local network (potentially via VPN) every stored journal file for every beamline is available within **JV2** from any computer. Moreover, if the location of the ISIS data archive is set, **JV2** will also be able to plot block value data from any run file detailed within the journal. **JV2** can be configured to read from local sources, meaning basic run information can be viewed even when off-site (without VPN) or offline when files are available.

**JV2** is also able to traverse through directories of run data (i.e. `log`, and/or `nxs` files) stored on a local machine, permitting block value interrogation to be performed offline as well. This is of particular use to external users who wish to use the software to process / view the run data associated with their experiments.
2 changes: 1 addition & 1 deletion doc/Pages/6.settings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ header_class: alt

### Set/ Clear local journal source (1)

The location from which to acquire journal data. The application uses this data to configure instrument and cycle selections and populate the table view. By default no local source is set and the files are accessed from data.isis.rl.ac.uk. The application will also look here in the event of issues with the set source.
The location from which to acquire journal data. The application uses this data to configure instrument and cycle selections and populate the table view. By default no local source is set and the files are accessed from http://journals.isis.cclrc.ac.uk/jv/. The application will also look here in the event of issues with the set source.

If using network data every 30 seconds the application checks for any new cycles or changes in the current journal file. The shortcut Ctrl-R manually causes an update check.

Expand Down
2 changes: 1 addition & 1 deletion frontend/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ void MainWindow::getJournalSourcesFromSettings(QCommandLineParser &cliParser)
journalSources_.emplace_back(std::make_unique<JournalSource>("ISIS Archive", JournalSource::IndexingType::Network));
isisArchive->setJournalOrganisationByInstrument(Instrument::PathType::AltNDXName);
isisArchive->setRunDataOrganisationByInstrument(Instrument::PathType::NDXName, true);
isisArchive->setJournalLocation("http://data.isis.rl.ac.uk/journals", "journal_main.xml");
isisArchive->setJournalLocation("http://journals.isis.cclrc.ac.uk/jv/", "journal_main.xml");
isisArchive->setRunDataLocation(settings
.value("ISISArchiveDataUrl", cliParser.isSet(CLIArgs::ISISArchiveDirectory)
? cliParser.value(CLIArgs::ISISArchiveDirectory)
Expand Down