Merge branch 'master' of gitlab.psi.ch:OPAL/src

doc/user_guide/opal_user_guide.tex

@@ -130,7 +130,7 @@ available in \opalt. Similar icons are used for the other flavours.
 \include{fieldemission}         % ch 16
 \include{multipact}             % ch 17
 \include{partmatter}            % ch 18
-
+\include{optimiser}              % ch 19
 %opal-map
 \ifthenelse{\boolean{ShowMap}}{
   \include{opal-flavours}        % ch 4

doc/user_guide/optimiser.tex

+\input{header}
+
+\chapter{Multi Objective Optimisation}
+\label{chp:moo}
+\index{Multi Objective Optimisation|(}
+
+
+\input{footer}
\ No newline at end of file

opt-pilot/CMakeLists.txt

@@ -82,7 +82,7 @@ set(Boost_USE_STATIC_LIBS ON)
 set(BOOST_NO_SYSTEM_PATHS TRUE)
 set(BOOST_INCLUDEDIR $ENV{BOOST_HOME})
 set(BOOST_LIBRARYDIR $ENV{BOOST_HOME}}/lib)
-find_package (Boost 1.55.0 REQUIRED chrono filesystem regex serialization system iostreams)
+find_package (Boost 1.54.0 REQUIRED chrono filesystem regex serialization system iostreams)
 if (Boost_INCLUDE_DIRS)
     message (STATUS "Boost include dirs: ${Boost_INCLUDE_DIRS}")
     include_directories (${Boost_INCLUDE_DIRS})
@@ -197,9 +197,18 @@ find_package(Doxygen)
 if (DOXYGEN_FOUND)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
         ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+IF (NOT OPTP_USED_FROM_OPAL)
     add_custom_target(doc
         ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Generating API documentation with Doxygen" VERBATIM
         )
+ELSE ()
+    add_custom_target(optpilot-doc
+        ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMENT "Generating API documentation with Doxygen" VERBATIM
+        )
+ENDIF()
+
 endif(DOXYGEN_FOUND)
\ No newline at end of file

opt-pilot/Tests/CMakeLists.txt

@@ -25,28 +25,33 @@ link_directories (
     ${PYTHON_LIBRARIES}
 )
 
+set (OPT_PILOT_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+IF (OPTP_USED_FROM_OPAL)
+    set (OPT_PILOT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/opt-pilot)
+ENDIF()
+
 set (ExpressionTest_SRC
-    ${CMAKE_SOURCE_DIR}/Util/SDDSReader.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Util/SDDSReader.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
 )
 
 set (SumErrSqExpressionTest_SRC
-    ${CMAKE_SOURCE_DIR}/Expression/SumErrSq.cpp
-    ${CMAKE_SOURCE_DIR}/Util/SDDSReader.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/SumErrSq.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Util/SDDSReader.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
 )
 
 set (FromFileExpressionTest_SRC
-    ${CMAKE_SOURCE_DIR}/Expression/FromFile.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/FromFile.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
 )
 
 set (PythonExprTest_SRC
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
 )
 
 
@@ -54,11 +59,11 @@ set (HashNameGeneratorTest_SRC
 )
 
 set (CmdArgumentsTest_SRC
-    ${CMAKE_SOURCE_DIR}/Util/CmdArguments.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Util/CmdArguments.cpp
 )
 
 set (MPIHelperTest_SRC
-    ${CMAKE_SOURCE_DIR}/Util/MPIHelper.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Util/MPIHelper.cpp
 )
 
 set (ManagedIDsTest_SRC
@@ -71,16 +76,16 @@ set (PopulationTest_SRC
 )
 
 set (SDDSParserTest_SRC
-    ${CMAKE_SOURCE_DIR}/Util/SDDSReader.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Util/SDDSReader.cpp
 )
 
 set (OpalInputFileParserTest_SRC
-    ${CMAKE_SOURCE_DIR}/Expression/SumErrSq.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/FromFile.cpp
-    ${CMAKE_SOURCE_DIR}/Util/SDDSReader.cpp
-    ${CMAKE_SOURCE_DIR}/Util/CommentAnnotatedInputFileParser.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
-    ${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/SumErrSq.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/FromFile.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Util/SDDSReader.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Util/CommentAnnotatedInputFileParser.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
+    ${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
 )
 
 set (PILOT_TESTS
@@ -123,7 +128,7 @@ ENDFOREACH(test ${PILOT_TESTS})
 #HACK: link resources dir to test dir
 if (NOT EXISTS ${PROJECT_BINARY_DIR}/Tests/resources)
     EXECUTE_PROCESS(
-        COMMAND ln -s ${CMAKE_SOURCE_DIR}/Tests/resources ${PROJECT_BINARY_DIR}/Tests/
+        COMMAND ln -s ${OPT_PILOT_SOURCE_DIR}/Tests/resources ${PROJECT_BINARY_DIR}/Tests/
         OUTPUT_VARIABLE LN_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
         )
-endif()
+endif()
\ No newline at end of file

tools/emacs/opal.el

@@ -47,6 +47,15 @@
 
 (add-to-list 'auto-mode-alist '("\\.opal\\'" . opal-mode))
 
+; optimiser keywords
+(defconst opal-font-lock-keywords-optimise
+  (list
+  '("\\<\\(DVAR\\|DVARS\\|OBJECTIVE\\|OBJECTIVES\\|CONSTRAINTS\\|OPTIMIZE\\)\\>"
+  . font-lock-builtin-face)
+  )
+  "Highlighting expressions for OPAL mode (matchingmet).")
+
+
 ;(regexp-opt '("CONSTRAINT" "ENDMATCH" "LINE" "MATCH" "RUN" "START" "TWISS" "VARY") t)
 
 (defconst opal-font-lock-keywords-simul
@@ -127,12 +136,12 @@
   )
   "Highlighting expressions for OPAL mode (seqediting).")
 
-;(regexp-opt '("A" "ADD" "AMPLITUDE_MODEL" "ANGLE" "APERTURE" "APVETO" "AT" "AUTOPHASE" "B" "BBOXINCR" "BCFFTT" "BCFFTX" "BCFFTY" "BCURRENT" "BEAM_PHIINIT" "BEAM_PRINIT" "BEAM_RINIT" "BFREQ" "BOUNDPDESTROYFQ" "BUNCHED" "BY" "CALLS" "CATHTEMP" "CENTRE" "CHARGE" "CLASS" "CMD" "CLEAR" "COLUMN" "CONDUCT" "CONST_LENGTH" "CORRX" "CORRY" "CORRZ" "CSRDUMP" "CUTOFFLONG" "CUTOFFPX" "CUTOFFPY" "CUTOFFPZ" "CUTOFFR" "CUTOFFX" "CUTOFFY" "CYHARMON" "CZERO" "DAMP" "DESIGNENERGY" "DK1" "DK1S" "DK2" "DK2S" "DKN" "DKNR" "DKS" "DKSR" "DLAG" "DPHI" "DPSI" "DS" "DT" "DTHETA" "DUMP" "DVOLT" "DX" "DY" "DZ" "E1" "E2" "EBDUMP" "ECHO" "EKIN" "ELASER" "ELEMEDGE" "ELEMENT" "EMISSIONMODEL" "EMISSIONSTEPS" "EMITTED" "ENABLEHDF5" "END_NORMAL_X" "END_NORMAL_Y" "END_POSITION_X" "END_POSITION_Y" "ENDSEQUENCE" "ESCALE" "ET" "EVERYSTEP" "EX" "EXN" "EY" "EYN" "FE" "FGEOM" "FILE" "FINT" "FMAPFN" "FNAME" "FORM" "FREQ" "FREQUENCY_MODEL" "FROM" "FSTYPE" "FTOSCAMPLITUDE" "FTOSCPERIODS" "FULL" "GAMMA" "GAP" "GAPWIDTH" "GEOMETRY" "GREENSF" "H1" "H2" "HAPERT" "HARMON" "HARMONIC_NUMBER" "HGAP" "HKICK" "IDEALIZED" "IMAGENAME" "INFO" "INPUTMOUNITS" "INTENSITYCUT" "INTERPL" "IS_CLOSED" "ITSOLVER" "K0" "K0S" "K1" "K1S" "K2" "K2S" "K3" "K3S" "KBUNCH" "KEYWORD" "KICK" "KN" "KS" "L" "LAG" "LASERPROFFN" "LATTICE_PHIINIT" "LATTICE_RINIT" "LATTICE_THETAINIT" "LENGTH" "LEVEL" "LOGBENDTRAJECTORY" "LOWER" "MASS" "MAXITERS" "MAXR" "MAXSTEPS" "MAXZ" "MBTC" "METHOD" "MINR" "MINZ" "MODE" "MREX" "MREY" "MSCALX" "MSCALY" "MT" "MX" "MY" "NBIN" "NFREQ" "NLEFT" "NO" "NPART" "NPOINTS" "NRIGHT" "NUMCELLS" "OFFSETPX" "OFFSETPY" "OFFSETPZ" "OFFSETT" "OFFSETX" "OFFSETY" "OFFSETZ" "OPCHARGE" "OPMASS" "OPYIELD" "ORDER" "ORIENTATION" "ORIGIN" "OUTFN" "P0" "P1" "P2" "P3" "P4" "PARFFTT" "PARFFTX" "PARFFTY" "PARTICLE" "PATTERN" "PC" "PHI" "PHI0" "PHIINIT" "PLANE" "POLYORDER" "PRECMODE" "PRINIT" "PSDUMPFRAME" "PSDUMPFREQ" "PSI" "PTC" "PYMULT" "PZINIT" "PZMULT" "QUANTUM" "R51" "R52" "R61" "R62" "RADIATE" "RADIUS" "RANDOM" "RANGE" "REFER" "REFPOS" "REPARTFREQ" "RESET" "RFMAPFN" "RFPHI" "RINIT" "RMAX" "RMIN" "ROTATION" "ROW" "S" "SEED" "SELECTED" "SEQUENCE" "SIGMA" "SIGMAPX" "SIGMAPY" "SIGMAPZ" "SIGMAR" "SIGMAT" "SIGMAX" "SIGMAY" "SIGMAZ" "SIGX" "SIGY" "SLPTC" "SPLIT" "STATDUMPFREQ" "STEP" "STEPSPERTURN" "STOP" "SUPERPOSE" "PARTICLEMATTERINTERACTION" "SCALABLE" "SYMMETRY" "T0" "TABLE" "TAU" "TCR1" "TCR2" "TELL" "TFALL" "THETA" "THIN" "THRESHOLD" "TIME" "TIMEINTEGRATOR" "TMULT" "TO" "TOL" "TOLERANCE" "TPULSEFWHM" "TRACE" "TRISE" "TURNS" "TYPE" "UPPER" "VERIFY" "VERSION" "VKICK" "VMAX" "VMIN" "VOLT" "W" "WAKEF" "WARN" "WEIGHT" "WIDTH" "WRITETOFILE" "X" "XEND" "XMA" "XMULT" "XSIZE" "XSTART" "Y" "YEND" "YMA" "YMULT" "YSIZE" "YSTART" "Z" "Z0" "ZEND" "ZINIT" "ZSTART" "ZSTOP") t)
+;(regexp-opt '("A" "ADD" "AMPLITUDE_MODEL" "ANGLE" "APERTURE" "APVETO" "AT" "AUTOPHASE" "B" "BBOXINCR" "BCFFTT" "BCFFTX" "BCFFTY" "BCURRENT" "BEAM_PHIINIT" "BEAM_PRINIT" "BEAM_RINIT" "BFREQ" "BOUNDPDESTROYFQ" "BUNCHED" "BY" "CALLS" "CATHTEMP" "CENTRE" "CHARGE" "CLASS" "CMD" "CLEAR" "COLUMN" "CONDUCT" "CONST_LENGTH" "CORRX" "CORRY" "CORRZ" "CSRDUMP" "CUTOFFLONG" "CUTOFFPX" "CUTOFFPY" "CUTOFFPZ" "CUTOFFR" "CUTOFFX" "CUTOFFY" "CYHARMON" "CZERO" "DAMP" "DESIGNENERGY" "DK1" "DK1S" "DK2" "DK2S" "DKN" "DKNR" "DKS" "DKSR" "DLAG" "DPHI" "DPSI" "DS" "DT" "DTHETA" "DUMP" "DVOLT" "DX" "DY" "DZ" "E1" "E2" "EBDUMP" "ECHO" "EKIN" "ELASER" "ELEMEDGE" "ELEMENT" "EMISSIONMODEL" "EMISSIONSTEPS" "EMITTED" "ENABLEHDF5" "END_NORMAL_X" "END_NORMAL_Y" "END_POSITION_X" "END_POSITION_Y" "ENDSEQUENCE" "ESCALE" "ET" "EVERYSTEP" "EX" "EXN" "EY" "EYN" "FE" "FGEOM" "FILE" "FINT" "FMAPFN" "FNAME" "FORM" "FREQ" "FREQUENCY_MODEL" "FROM" "FSTYPE" "FTOSCAMPLITUDE" "FTOSCPERIODS" "FULL" "GAMMA" "GAP" "GAPWIDTH" "GEOMETRY" "GREENSF" "H1" "H2" "HAPERT" "HARMON" "HARMONIC_NUMBER" "HGAP" "HKICK" "IDEALIZED" "IMAGENAME" "INFO" "INPUTMOUNITS" "INTENSITYCUT" "INTERPL" "IS_CLOSED" "ITSOLVER" "K0" "K0S" "K1" "K1S" "K2" "K2S" "K3" "K3S" "KBUNCH" "KEYWORD" "KICK" "KN" "KS" "L" "LAG" "LASERPROFFN" "LATTICE_PHIINIT" "LATTICE_RINIT" "LATTICE_THETAINIT" "LENGTH" "LEVEL" "LOGBENDTRAJECTORY" "LOWER" "MASS" "MAXITERS" "MAXR" "MAXSTEPS" "MAXZ" "MBTC" "METHOD" "MINR" "MINZ" "MODE" "MREX" "MREY" "MSCALX" "MSCALY" "MT" "MX" "MY" "NBIN" "NFREQ" "NLEFT" "NO" "NPART" "NPOINTS" "NRIGHT" "NUMCELLS" "OFFSETPX" "OFFSETPY" "OFFSETPZ" "OFFSETT" "OFFSETX" "OFFSETY" "OFFSETZ" "OPCHARGE" "OPMASS" "OPYIELD" "ORDER" "ORIENTATION" "ORIGIN" "OUTFN" "P0" "P1" "P2" "P3" "P4" "PARFFTT" "PARFFTX" "PARFFTY" "PARTICLE" "PATTERN" "PC" "PHI" "PHI0" "PHIINIT" "PLANE" "POLYORDER" "PRECMODE" "PRINIT" "PSDUMPFRAME" "PSDUMPFREQ" "PSI" "PTC" "PYMULT" "PZINIT" "PZMULT" "QUANTUM" "R51" "R52" "R61" "R62" "RADIATE" "RADIUS" "RANDOM" "RANGE" "REFER" "REFPOS" "REPARTFREQ" "RESET" "RFMAPFN" "RFPHI" "RINIT" "RMAX" "RMIN" "ROTATION" "ROW" "S" "SEED" "SELECTED" "SEQUENCE" "SIGMA" "SIGMAPX" "SIGMAPY" "SIGMAPZ" "SIGMAR" "SIGMAT" "SIGMAX" "SIGMAY" "SIGMAZ" "SIGX" "SIGY" "SLPTC" "SPLIT" "STATDUMPFREQ" "STEP" "STEPSPERTURN" "STOP" "SUPERPOSE" "PARTICLEMATTERINTERACTION" "SCALABLE" "SYMMETRY" "T0" "TABLE" "TAU" "TCR1" "TCR2" "TELL" "TFALL" "THETA" "THIN" "THRESHOLD" "TIME" "TIMEINTEGRATOR" "TMULT" "TO" "TOL" "TOLERANCE" "TPULSEFWHM" "TRACE" "TRISE" "TURNS" "TYPE" "UPPER" "VERIFY" "VERSION" "VKICK" "VMAX" "VMIN" "VOLT" "W" "WAKEF" "WARP" "WARN" "WEIGHT" "WIDTH" "WRITETOFILE" "X" "XEND" "XMA" "XMULT" "XSIZE" "XSTART" "Y" "YEND" "YMA" "YMULT" "YSIZE" "YSTART" "Z" "Z0" "ZEND" "ZINIT" "ZSTART" "ZSTOP") t)
 
 
 (defconst opal-font-lock-keywords-parameters
   (list
-  '("\\<\\(A\\(?:DD\\|MPLITUDE_MODEL\\|NGLE\\|P\\(?:ERTURE\\|VETO\\)\\|T\\|UTOPHASE\\)\\|B\\(?:BOXINCR\\|C\\(?:FFT[TXY]\\|URRENT\\)\\|EAM_\\(?:\\(?:P\\(?:HI\\|R\\)\\|R\\)INIT\\)\\|FREQ\\|OUNDPDESTROYFQ\\|UNCHED\\|Y\\)\\|C\\(?:A\\(?:LLS\\|THTEMP\\)\\|ENTRE\\|HARGE\\|L\\(?:ASS\\|EAR\\)\\|MD\\|O\\(?:LUMN\\|N\\(?:DUCT\\|ST_LENGTH\\)\\|RR[XYZ]\\)\\|SRDUMP\\|UTOFF\\(?:LONG\\|P[XYZ]\\|[RXY]\\)\\|YHARMON\\|ZERO\\)\\|D\\(?:AMP\\|ESIGNENERGY\\|K\\(?:1S\\|2S\\|[NS]R\\|[12NS]\\)\\|LAG\\|P\\(?:[HS]I\\)\\|THETA\\|UMP\\|VOLT\\|[STXYZ]\\)\\|E\\(?:BDUMP\\|CHO\\|KIN\\|L\\(?:ASER\\|EME\\(?:DGE\\|NT\\)\\)\\|MI\\(?:SSION\\(?:MODEL\\|STEPS\\)\\|TTED\\)\\|N\\(?:ABLEHDF5\\|D\\(?:SEQUENCE\\|_\\(?:NORMAL_[XY]\\|POSITION_[XY]\\)\\)\\)\\|SCALE\\|VERYSTEP\\|[XY]N\\|[12TXY]\\)\\|F\\(?:E\\|GEOM\\|I\\(?:LE\\|NT\\)\\|MAPFN\\|NAME\\|ORM\\|R\\(?:EQ\\(?:UENCY_MODEL\\)?\\|OM\\)\\|STYPE\\|TOSC\\(?:AMPLITUDE\\|PERIODS\\)\\|ULL\\)\\|G\\(?:A\\(?:MMA\\|P\\(?:WIDTH\\)?\\)\\|EOMETRY\\|REENSF\\)\\|H\\(?:A\\(?:PERT\\|RMON\\(?:IC_NUMBER\\)?\\)\\|GAP\\|KICK\\|[12]\\)\\|I\\(?:DEALIZED\\|MAGENAME\\|N\\(?:FO\\|PUTMOUNITS\\|TE\\(?:NSITYCUT\\|RPL\\)\\)\\|S_CLOSED\\|TSOLVER\\)\\|K\\(?:0S\\|1S\\|2S\\|3S\\|BUNCH\\|EYWORD\\|ICK\\|[0-3NS]\\)\\|L\\(?:A\\(?:G\\|SERPROFFN\\|TTICE_\\(?:\\(?:PHI\\|R\\|THETA\\)INIT\\)\\)\\|E\\(?:NGTH\\|VEL\\)\\|O\\(?:GBENDTRAJECTORY\\|WER\\)\\)\\|M\\(?:A\\(?:SS\\|X\\(?:ITERS\\|STEPS\\|[RZ]\\)\\)\\|BTC\\|ETHOD\\|IN[RZ]\\|ODE\\|RE[XY]\\|SCAL[XY]\\|[TXY]\\)\\|N\\(?:BIN\\|FREQ\\|LEFT\\|O\\|P\\(?:ART\\|OINTS\\)\\|RIGHT\\|UMCELLS\\)\\|O\\(?:FFSET\\(?:P[XYZ]\\|[TXYZ]\\)\\|P\\(?:CHARGE\\|MASS\\|YIELD\\)\\|R\\(?:DER\\|I\\(?:\\(?:ENTATIO\\|GI\\)N\\)\\)\\|UTFN\\)\\|P\\(?:A\\(?:R\\(?:FFT[TXY]\\|TICLE\\(?:MATTERINTERACTION\\)?\\)\\|TTERN\\)\\|HI\\(?:0\\|INIT\\)?\\|LANE\\|OLYORDER\\|R\\(?:ECMODE\\|INIT\\)\\|S\\(?:DUMPFR\\(?:AME\\|EQ\\)\\|I\\)\\|TC\\|\\(?:YMUL\\|Z\\(?:INI\\|MUL\\)\\)T\\|[0-4C]\\)\\|QUANTUM\\|R\\(?:5[12]\\|6[12]\\|A\\(?:DI\\(?:ATE\\|US\\)\\|N\\(?:DOM\\|GE\\)\\)\\|E\\(?:F\\(?:ER\\|POS\\)\\|PARTFREQ\\|SET\\)\\|F\\(?:MAPFN\\|PHI\\)\\|INIT\\|M\\(?:AX\\|IN\\)\\|O\\(?:TATION\\|W\\)\\)\\|S\\(?:CALABLE\\|E\\(?:ED\\|LECTED\\|QUENCE\\)\\|IG\\(?:MA\\(?:P[XYZ]\\|[RTXYZ]\\)?\\|[XY]\\)\\|LPTC\\|PLIT\\|T\\(?:ATDUMPFREQ\\|EP\\(?:SPERTURN\\)?\\|OP\\)\\|UPERPOSE\\|YMMETRY\\)\\|T\\(?:A\\(?:BLE\\|U\\)\\|CR[12]\\|ELL\\|FALL\\|H\\(?:ETA\\|IN\\|RESHOLD\\)\\|IME\\(?:INTEGRATOR\\)?\\|MULT\\|OL\\(?:ERANCE\\)?\\|PULSEFWHM\\|R\\(?:\\(?:AC\\|IS\\)E\\)\\|URNS\\|YPE\\|[0O]\\)\\|UPPER\\|V\\(?:ER\\(?:IFY\\|SION\\)\\|KICK\\|M\\(?:AX\\|IN\\)\\|OLT\\)\\|W\\(?:A\\(?:KEF\\|RN\\)\\|EIGHT\\|IDTH\\|RITETOFILE\\)\\|X\\(?:END\\|M\\(?:A\\|ULT\\)\\|S\\(?:IZE\\|TART\\)\\)\\|Y\\(?:END\\|M\\(?:A\\|ULT\\)\\|S\\(?:IZE\\|TART\\)\\)\\|Z\\(?:0\\|END\\|INIT\\|ST\\(?:ART\\|OP\\)\\)\\|[ABLSW-Z]\\)\\>"
+  '("\\<\\(A\\(?:DD\\|MPLITUDE_MODEL\\|NGLE\\|P\\(?:ERTURE\\|VETO\\)\\|T\\|UTOPHASE\\)\\|B\\(?:BOXINCR\\|C\\(?:FFT[TXY]\\|URRENT\\)\\|EAM_\\(?:\\(?:P\\(?:HI\\|R\\)\\|R\\)INIT\\)\\|FREQ\\|OUNDPDESTROYFQ\\|UNCHED\\|Y\\)\\|C\\(?:A\\(?:LLS\\|THTEMP\\)\\|ENTRE\\|HARGE\\|L\\(?:ASS\\|EAR\\)\\|MD\\|O\\(?:LUMN\\|N\\(?:DUCT\\|ST_LENGTH\\)\\|RR[XYZ]\\)\\|SRDUMP\\|UTOFF\\(?:LONG\\|P[XYZ]\\|[RXY]\\)\\|YHARMON\\|ZERO\\)\\|D\\(?:AMP\\|ESIGNENERGY\\|K\\(?:1S\\|2S\\|[NS]R\\|[12NS]\\)\\|LAG\\|P\\(?:[HS]I\\)\\|THETA\\|UMP\\|VOLT\\|[STXYZ]\\)\\|E\\(?:BDUMP\\|CHO\\|KIN\\|L\\(?:ASER\\|EME\\(?:DGE\\|NT\\)\\)\\|MI\\(?:SSION\\(?:MODEL\\|STEPS\\)\\|TTED\\)\\|N\\(?:ABLEHDF5\\|D\\(?:SEQUENCE\\|_\\(?:NORMAL_[XY]\\|POSITION_[XY]\\)\\)\\)\\|SCALE\\|VERYSTEP\\|[XY]N\\|[12TXY]\\)\\|F\\(?:E\\|GEOM\\|I\\(?:LE\\|NT\\)\\|MAPFN\\|NAME\\|ORM\\|R\\(?:EQ\\(?:UENCY_MODEL\\)?\\|OM\\)\\|STYPE\\|TOSC\\(?:AMPLITUDE\\|PERIODS\\)\\|ULL\\)\\|G\\(?:A\\(?:MMA\\|P\\(?:WIDTH\\)?\\)\\|EOMETRY\\|REENSF\\)\\|H\\(?:A\\(?:PERT\\|RMON\\(?:IC_NUMBER\\)?\\)\\|GAP\\|KICK\\|[12]\\)\\|I\\(?:DEALIZED\\|MAGENAME\\|N\\(?:FO\\|PUTMOUNITS\\|TE\\(?:NSITYCUT\\|RPL\\)\\)\\|S_CLOSED\\|TSOLVER\\)\\|K\\(?:0S\\|1S\\|2S\\|3S\\|BUNCH\\|EYWORD\\|ICK\\|[0-3NS]\\)\\|L\\(?:A\\(?:G\\|SERPROFFN\\|TTICE_\\(?:\\(?:PHI\\|R\\|THETA\\)INIT\\)\\)\\|E\\(?:NGTH\\|VEL\\)\\|O\\(?:GBENDTRAJECTORY\\|WER\\)\\)\\|M\\(?:A\\(?:SS\\|X\\(?:ITERS\\|STEPS\\|[RZ]\\)\\)\\|BTC\\|ETHOD\\|IN[RZ]\\|ODE\\|RE[XY]\\|SCAL[XY]\\|[TXY]\\)\\|N\\(?:BIN\\|FREQ\\|LEFT\\|O\\|P\\(?:ART\\|OINTS\\)\\|RIGHT\\|UMCELLS\\)\\|O\\(?:FFSET\\(?:P[XYZ]\\|[TXYZ]\\)\\|P\\(?:CHARGE\\|MASS\\|YIELD\\)\\|R\\(?:DER\\|I\\(?:\\(?:ENTATIO\\|GI\\)N\\)\\)\\|UTFN\\)\\|P\\(?:A\\(?:R\\(?:FFT[TXY]\\|TICLE\\(?:MATTERINTERACTION\\)?\\)\\|TTERN\\)\\|HI\\(?:0\\|INIT\\)?\\|LANE\\|OLYORDER\\|R\\(?:ECMODE\\|INIT\\)\\|S\\(?:DUMPFR\\(?:AME\\|EQ\\)\\|I\\)\\|TC\\|\\(?:YMUL\\|Z\\(?:INI\\|MUL\\)\\)T\\|[0-4C]\\)\\|QUANTUM\\|R\\(?:5[12]\\|6[12]\\|A\\(?:DI\\(?:ATE\\|US\\)\\|N\\(?:DOM\\|GE\\)\\)\\|E\\(?:F\\(?:ER\\|POS\\)\\|PARTFREQ\\|SET\\)\\|F\\(?:MAPFN\\|PHI\\)\\|INIT\\|M\\(?:AX\\|IN\\)\\|O\\(?:TATION\\|W\\)\\)\\|S\\(?:CALABLE\\|E\\(?:ED\\|LECTED\\|QUENCE\\)\\|IG\\(?:MA\\(?:P[XYZ]\\|[RTXYZ]\\)?\\|[XY]\\)\\|LPTC\\|PLIT\\|T\\(?:ATDUMPFREQ\\|EP\\(?:SPERTURN\\)?\\|OP\\)\\|UPERPOSE\\|YMMETRY\\)\\|T\\(?:A\\(?:BLE\\|U\\)\\|CR[12]\\|ELL\\|FALL\\|H\\(?:ETA\\|IN\\|RESHOLD\\)\\|IME\\(?:INTEGRATOR\\)?\\|MULT\\|OL\\(?:ERANCE\\)?\\|PULSEFWHM\\|R\\(?:\\(?:AC\\|IS\\)E\\)\\|URNS\\|YPE\\|[0O]\\)\\|UPPER\\|V\\(?:ER\\(?:IFY\\|SION\\)\\|KICK\\|M\\(?:AX\\|IN\\)\\|OLT\\)\\|W\\(?:A\\(?:KEF\\|R[NP]\\)\\|EIGHT\\|IDTH\\|RITETOFILE\\)\\|X\\(?:END\\|M\\(?:A\\|ULT\\)\\|S\\(?:IZE\\|TART\\)\\)\\|Y\\(?:END\\|M\\(?:A\\|ULT\\)\\|S\\(?:IZE\\|TART\\)\\)\\|Z\\(?:0\\|END\\|INIT\\|ST\\(?:ART\\|OP\\)\\)\\|[ABLSW-Z]\\)\\>"
   . font-lock-doc-face)
   )
   "Highlighting expressions for OPAL mode (parameters).")
@@ -200,6 +209,7 @@
 
 (defconst opal-font-lock-keywords-3
   (append
+     opal-font-lock-keywords-optimise
      opal-font-lock-special_operators
      opal-font-lock-special_constants
      opal-font-lock-keywords-programflow