New Algorithm to correct detector efficiency at ILL Refs #6850

Code/Mantid/Framework/Algorithms/CMakeLists.txt

@@ -64,6 +64,7 @@ set ( SRC_FILES
 	src/DeleteWorkspace.cpp
 	src/DetectorDiagnostic.cpp
 	src/DetectorEfficiencyCor.cpp
+	src/DetectorEfficiencyCorUser.cpp
 	src/DetectorEfficiencyVariation.cpp
 	src/DiffractionEventCalibrateDetectors.cpp
 	src/DiffractionFocussing.cpp
@@ -75,8 +76,8 @@ set ( SRC_FILES
 	src/EditInstrumentGeometry.cpp
 	src/ElasticWindow.cpp
 	src/Exponential.cpp
-	src/ExportTimeSeriesLog.cpp
 	src/ExponentialCorrection.cpp
+	src/ExportTimeSeriesLog.cpp
 	src/ExtractFFTSpectrum.cpp
 	src/ExtractMask.cpp
 	src/ExtractMasking.cpp
@@ -275,6 +276,7 @@ set ( INC_FILES
 	inc/MantidAlgorithms/DeleteWorkspace.h
 	inc/MantidAlgorithms/DetectorDiagnostic.h
 	inc/MantidAlgorithms/DetectorEfficiencyCor.h
+	inc/MantidAlgorithms/DetectorEfficiencyCorUser.h
 	inc/MantidAlgorithms/DetectorEfficiencyVariation.h
 	inc/MantidAlgorithms/DiffractionEventCalibrateDetectors.h
 	inc/MantidAlgorithms/DiffractionFocussing.h
@@ -494,6 +496,7 @@ set ( TEST_FILES
 	CylinderAbsorptionTest.h
 	DeleteWorkspaceTest.h
 	DetectorEfficiencyCorTest.h
+	DetectorEfficiencyCorUserTest.h
 	DetectorEfficiencyVariationTest.h
 	DiffractionEventCalibrateDetectorsTest.h
 	DiffractionFocussing2Test.h

Code/Mantid/instrument/IN4_Parameters.xml

 <?xml version="1.0" encoding="UTF-8" ?>
-<parameter-file instrument="IN5" date="2012-10-01T00:00:00">
+<parameter-file instrument="IN4" date="2012-10-01T00:00:00">
 
-	<component-link name="IN5">
+	<component-link name="IN4">
 
 		<parameter name="deltaE-mode" type="string">
 			<value val="direct" />
 		</parameter>
-		
-		<!--  
-		Distance between sample and equatorial line
-		of the detector. Mandatory if you want to correct
-		the flight paths.
-		-->
+
+		<!-- Distance between sample and equatorial line of the detector. Mandatory 
+			if you want to correct the flight paths. -->
 		<parameter name="l2" type="string">
 			<value val="2.0" />
 		</parameter>
 
+		<!-- formula for Detector efficiency calculation. Algorithm: DetectorEfficiencyCorUser 
+			See http://muparser.sourceforge.net/mup_features.html#idDef2 for available 
+			operators -->
+		<parameter name="formula_eff0" type="string">
+			<value val="0.951*exp(-0.0887/sqrt(e0))*(1.0-exp(-5.597/sqrt(e0)))" />
+		</parameter>
+		<parameter name="formula_eff" type="string">
+			<value val="0.951/eff0*exp(-0.0887/sqrt(e))*(1.0-exp(-5.597/sqrt(e)))" />
+		</parameter>
+
 	</component-link>
 
 </parameter-file>

Code/Mantid/instrument/IN5_Parameters.xml

@@ -6,16 +6,23 @@
 		<parameter name="deltaE-mode" type="string">
 			<value val="direct" />
 		</parameter>
-		
-		<!--  
-		Distance between sample and equatorial line
-		of the detector. Mandatory if you want to correct
-		the flight paths.
-		-->
+
+		<!-- Distance between sample and equatorial line of the detector. Mandatory 
+			if you want to correct the flight paths. -->
 		<parameter name="l2" type="string">
 			<value val="4.0" />
 		</parameter>
 
+		<!-- formula for Detector efficiency calculation. Algorithm: DetectorEfficiencyCorUser 
+			See http://muparser.sourceforge.net/mup_features.html#idDef2 for available 
+			operators -->
+		<parameter name="formula_eff0" type="string">
+			<value val="exp(-0.0565/sqrt(e0))*(1.-exp(-3.284/sqrt(e0)))" />
+		</parameter>
+		<parameter name="formula_eff" type="string">
+			<value val="1.0/eff0*exp(-0.0565/sqrt(e))*(1.0-exp(-3.284/sqrt(e)))" />
+		</parameter>
+
 	</component-link>
 
 </parameter-file>

Code/Mantid/instrument/IN6_Parameters.xml

@@ -6,16 +6,23 @@
 		<parameter name="deltaE-mode" type="string">
 			<value val="direct" />
 		</parameter>
-		
-		<!--  
-		Distance between sample and equatorial line
-		of the detector. Mandatory if you want to correct
-		the flight paths.
-		-->
+
+		<!-- Distance between sample and equatorial line of the detector. Mandatory 
+			if you want to correct the flight paths. -->
 		<parameter name="l2" type="string">
 			<value val="2.48" />
 		</parameter>
 
+		<!-- formula for Detector efficiency calculation. Algorithm: DetectorEfficiencyCorUser 
+			See http://muparser.sourceforge.net/mup_features.html#idDef2 for available 
+			operators -->
+		<parameter name="formula_eff0" type="string">
+			<value val="exp(-0.0565/sqrt(e0))*(1.0-exp(-3.284/sqrt(e0)))" />
+		</parameter>
+		<parameter name="formula_eff" type="string">
+			<value val="1.0/eff0*exp(-0.0565/sqrt(e))*(1.0-exp(-3.284/sqrt(e)))" />
+		</parameter>
+
 	</component-link>
 
 </parameter-file>