Index: trunk/FACT++/CMakeLists.txt
===================================================================
--- trunk/FACT++/CMakeLists.txt	(revision 19392)
+++ trunk/FACT++/CMakeLists.txt	(revision 19393)
@@ -201,40 +201,5 @@
 ENDIF(NOT TOOLS_ONLY)
 
-# =========== Enable C++11 ===========
-
-SET(CMAKE_CXX_STANDARD 11)
-
-#ADD_DEFINITIONS(-D__CMAKE__)
-
-SET(CMAKE_CXX_FLAGS
-	"${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \
-         -Wcast-align -Wformat=2 -Woverloaded-virtual \
-         -Wnon-virtual-dtor -Wshadow -Wno-unknown-pragmas") # -Wextra
-
-# -D__MARS__
-SET(CMAKE_CXX_FLAGS
-	"${CMAKE_CXX_FLAGS} \
-         -D_REENTRANT -D__LINUX__ \
-         -DHAVE_ZLIB -DHAVE_ROOT -DHAVE_V8 -DHAVE_SQL -DHAVE_NOVA -DHAVE_FITS \
-         -DMARSVER=\\\"${VERSION}\\\" \
-         -DPACKAGE_VERSION=\\\"${VERSION}\\\" \
-         -DREVISION=\\\"${REVISION}\\\" \
-         -DPACKAGE_NAME=\\\"FACT++\\\" \
-         -DPACKAGE_STRING=\\\"FACT++\\\" \
-         -DPACKAGE_URL=\\\"${PACKAGE_URL}\\\" \
-         -DPACKAGE_BUGREPORT=\\\"${PACKAGE_BUGREPORT}\\\""
-         )
-
-#         -DBOOST_DISABLE_ASSERTS \
-#         -DBOOST_NO_STD_LOCALE=1 \
-#         -DBOOST_REXEG_NO_FWD=1 \
-#         -DBOOST_NO_MEMBER_TEMPLATES=1 \
-#         -DBOOST_HAS_ABI_HEADERS=1 \
-
-# Flags required for Dim
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux")
-
-
-# --------- ROOT -------------
+# ============== ROOT ================
 
 FIND_PROGRAM(ROOTCONFIG_EXECUTABLE NAMES root-config)
@@ -301,4 +266,56 @@
 #                                    LINKDEF linkdef1 ...
 #                                    OPTIONS opt1...)
+
+# *********************************
+# ********** Observatory **********
+# *********************************
+
+SET(OBSERVATORY "ORM" CACHE STRING "Select the observatory location (ORM, HAWC, SPM, RWTH: see nova.h)")
+
+IF(NOT OBSERVATORY STREQUAL "ORM"  AND
+   NOT OBSERVATORY STREQUAL "HAWC" AND
+   NOT OBSERVATORY STREQUAL "SPM"  AND
+   NOT OBSERVATORY STREQUAL "RWTH")
+   MESSAGE(FATAL_ERROR "OBSERVATORY=${OBSERVATORY} invalid. Only ORM, HAWC, SPM and RWTH allowd!")
+ENDIF()
+
+FIND_PACKAGE_MESSAGE(PresetObservatory "Preset Observatory: ${OBSERVATORY}" "[${OBSERVATORY}]")
+
+# *********************************
+# *********** Compiler ************
+# *********************************
+
+SET(CMAKE_CXX_STANDARD 11)
+
+#ADD_DEFINITIONS(-D__CMAKE__)
+
+SET(CMAKE_CXX_FLAGS
+	"${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \
+         -Wcast-align -Wformat=2 -Woverloaded-virtual \
+         -Wnon-virtual-dtor -Wshadow -Wno-unknown-pragmas") # -Wextra
+
+# -D__MARS__
+SET(CMAKE_CXX_FLAGS
+	"${CMAKE_CXX_FLAGS} \
+         -D_REENTRANT -D__LINUX__ \
+         -DHAVE_ZLIB -DHAVE_ROOT -DHAVE_V8 -DHAVE_SQL -DHAVE_NOVA -DHAVE_FITS -DPRESET_OBSERVATORY=k${OBSERVATORY} \
+         -DMARSVER=\\\"${VERSION}\\\" \
+         -DPACKAGE_VERSION=\\\"${VERSION}\\\" \
+         -DREVISION=\\\"${REVISION}\\\" \
+         -DPACKAGE_NAME=\\\"FACT++\\\" \
+         -DPACKAGE_STRING=\\\"FACT++\\\" \
+         -DPACKAGE_URL=\\\"${PACKAGE_URL}\\\" \
+         -DPACKAGE_BUGREPORT=\\\"${PACKAGE_BUGREPORT}\\\""
+         )
+
+#         -DBOOST_DISABLE_ASSERTS \
+#         -DBOOST_NO_STD_LOCALE=1 \
+#         -DBOOST_REXEG_NO_FWD=1 \
+#         -DBOOST_NO_MEMBER_TEMPLATES=1 \
+#         -DBOOST_HAS_ABI_HEADERS=1 \
+
+# Flags required for Dim
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux")
+
 
 # -------------------------------------------------------