Context Navigation

← Previous Ticket
Next Ticket →

Ticket #8449 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Remove Sassena version check

Reported by:	Jose Borreguero	Owned by:	Jose Borreguero
Priority:	major	Milestone:	Release 3.1
Component:	Indirect Inelastic	Keywords:
Cc:		Blocked By:
Blocking:		Tester:	Karl Palmen

Description (last modified by Jose Borreguero) (diff)

It was decided (about one year ago) that Sassena output files would contain an version stamp. Nothing has been done and since there is only one version of the software, it does not make sense to check for the version. Specially when one must 'stamp' the Sassena output with a version so that the Mantid algorithm can load the file.

For the tester:

In MantidPlot, load the attached file fqt_coh.hd5 using "Load" algorithm. You should see an error message "Unable to read Sassena version" but otherwise the file should load successfully.

Attachments

fqt_coh.hd5 (875.1 KB) - added by Jose Borreguero 7 years ago.: Sassena output file

Change History

comment:1 Changed 7 years ago by Jose Borreguero

Status changed from new to inprogress

comment:2 Changed 7 years ago by Jose Borreguero

Refs #8449 fix in conficence method

modified: LoadSassena.cpp

Changeset: c1be6b4291828dd0df7f8680a565961bcd44d98e

comment:3 Changed 7 years ago by Jose Borreguero

Refs #8449 Switched throw with warning

Changeset: 6258b554b9c3a8d6caa3c96069b854f0264f4deb

comment:4 Changed 7 years ago by Jose Borreguero

Refs #8449 Revert changes

It's too late in the day to fix the build server errors

Changeset: 0ddf3862af3250cafeacf9a1b691625f49174ab8

comment:5 Changed 7 years ago by Jose Borreguero

Refs #8449 Do not check for sassena version

Changeset: 52828d4eea0d209c27664009a74dc4b1b3614fed

comment:6 Changed 7 years ago by Jose Borreguero

Refs #8449 Revert changes

Changeset: 2fc85388de1b851d32eb70c43f7012b0e07ca438

comment:7 Changed 7 years ago by Jose Borreguero

Refs #8449 Do not check sassena version stamp

Changeset: dafe1abb906bf3936242d9ce26027422fe0a08eb

comment:8 Changed 7 years ago by Jose Borreguero

Refs #8449 Do not check for sassena version stamp

Changeset: a318676e6b74b4d009131f3a6603f0f3ba8ee23b

comment:9 Changed 7 years ago by Jose Borreguero

Refs #8449 Trying to solve merge conflicts

Merge branch 'feature/8449_sassena_stamp_removal' into develop

Conflicts:

Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp

Changeset: 2afcfcb424d779de18c2d7b9b2f9f2e810e976d5

comment:10 Changed 7 years ago by Jose Borreguero

Refs #8449 Replace throw with log error

Changeset: 7424934941d257b4676da817810fce7650b7292b

comment:11 Changed 7 years ago by Jose Borreguero

Refs #8449 Resolving merge conflicts

Merge branch 'feature/8449_sassena_stamp_removal' into develop

Conflicts:

Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp

Changeset: 27f0d67a8bc68d7072a23d9253012e9778463972

Changed 7 years ago by Jose Borreguero

Attachment fqt_coh.hd5 added

Sassena output file

comment:12 Changed 7 years ago by Jose Borreguero

Status changed from inprogress to verify
Resolution set to fixed

For the tester:

In MantidPlot, load the attached file fqt_coh.hd5 using "LoadSassena" algorithm. You should see an error message "Unable to read Sassena version" but otherwise the file should load successfully.

comment:13 Changed 7 years ago by Keith Brown

Status changed from verify to verifying
Tester set to Keith Brown

comment:14 Changed 7 years ago by Keith Brown

Status changed from verifying to reopened
Resolution fixed deleted

Sassena files without the version will load, but what you've done to the confidence method makes the algorithm the choice for any nexus-type file as you've left the confidence so high for files that don't contain a Sassena version.

Your check on files that don't contain a Sassena version needs to be better so that this will be selected for Sassena files without a verison, but not be selected for other nexus-type files.

int LoadSassena::confidence(Kernel::NexusDescriptor & descriptor) const
{
  if(descriptor.hasRootAttr("sassena_version"))
	return 99;
  else
	return 99; <-- this is causing it to try to load ANY nexus file
	// 0; uncomment when sassena output contains a version 
}

comment:15 Changed 7 years ago by Jose Borreguero

Status changed from reopened to inprogress

Refs #8449 Use dataSetInfo in confidence method

modified: LoadSassena.h modified: LoadSassena.cpp

Changeset: 348ecf227d4fb4dec9dd32effe75aa9092c7a5d2

comment:16 Changed 7 years ago by Jose Borreguero

Refs #8449 Redid changes starting from updated master

modified: LoadSassena.h modified: LoadSassena.cpp

Changeset: 4fca27e9b2bb60f3ad800695d2645704276cc159

comment:17 Changed 7 years ago by Jose Borreguero

Refs #8449 Merge conflicts

Merge branch 'feature/8449_sassena_stamp_removal' into develop

Conflicts:

Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp

Changeset: 08cc3eb00a50cf6aa3b5c60af518cf2f00deebb7

comment:18 Changed 7 years ago by Jose Borreguero

Description modified (diff)

comment:19 Changed 7 years ago by Jose Borreguero

Refs #8449 Python test fails, remove changes until problem fixed

Changeset: b8bf80d8e51f588162ce9a7601b643594031edd3

comment:20 Changed 7 years ago by Jose Borreguero

Refs #8449 Cmakefile commented until I figure out the error

Changeset: d31d25bdb89bd58e01db2640c7afc6ea3094ba90

comment:21 Changed 7 years ago by Jose Borreguero

Refs #8449 Addd extra check in confidence method

Changeset: cadabcbd1165376e405294226554f3488707d6e6

comment:22 Changed 7 years ago by Jose Borreguero

Description modified (diff)

comment:23 Changed 7 years ago by Jose Borreguero

Note to Tester: In MantidPlot, load the attached file fqt_coh.hd5 using "Load" algorithm. You should see an error message "Unable to read Sassena version" but otherwise the file should load successfully.