diff --git a/OnlTools/Jevp/level.source b/OnlTools/Jevp/level.source index 5d6ad67bccd..e4bbe2620c8 100644 --- a/OnlTools/Jevp/level.source +++ b/OnlTools/Jevp/level.source @@ -1,4 +1,7 @@ # STAR LEVEL for EVP code -starver SL23b +starver SL23c #starver SL21b + + +unsetenv DB_SERVER_LOCAL_CONFIG diff --git a/StRoot/RTS/include/rtsLog.h b/StRoot/RTS/include/rtsLog.h index c93e3cd42bb..fb9e310ae6e 100755 --- a/StRoot/RTS/include/rtsLog.h +++ b/StRoot/RTS/include/rtsLog.h @@ -92,25 +92,10 @@ void rtsLogAddJmlFile (char *fname); - - - #ifndef RTS_ENABLE_LOG - #define RTS_ASSERT(expr) assert(expr) #define LOG(SEV,STRING,ARGS...) -#define rtsLogUnix_v(str, ...) -#define rtsLogAddCmd(x) - - -// the following become noops... -#define rtsLogLevel(x) -#define rtsLogAddDest(x,y) -#define rtsLogLevelInt(x) -#define rtsLogOutput(x) - -#else /* RTS_ENABLE_LOG */ - +#endif #ifdef __GNUC__ #define INLINE_HACK extern __inline__ @@ -182,7 +167,7 @@ INLINE_HACK void rtsLogLevel(const char *level) #define sbLOG(args...) #endif - +#ifdef RTS_ENABLE_LOG #define LOG(SEV,STRING,A1,A2,A3,A4,A5) \ do { \ const char *const yada = SEV ; \ @@ -195,15 +180,17 @@ INLINE_HACK void rtsLogLevel(const char *level) logMsg((char *)"" SEV ": " __FILE__ " [line %d]: " STRING "\n",__LINE__,(unsigned int)A1,(unsigned int)A2,(unsigned int)A3,(unsigned int)A4,(unsigned int)A5) ; \ sbLOG((char *)"" SEV ": " __FILE__ " [line %d]: " STRING "\n",__LINE__,(unsigned int)A1,(unsigned int)A2,(unsigned int)A3,(unsigned int)A4,(unsigned int)A5) ; \ } \ - } while(0) \ + } while(0) +#endif // RTS_ENABLE_LOG #define rtsLogOutput(x) #else /* unix */ +#ifdef RTS_ENABLE_LOG #define RTS_ASSERT(expr) LOG(CRIT,"assert(%s) true -- certain death follows",__STRING(expr)) - +#endif extern int rtsLogUnix_v(const char *str, ...) ; extern int rtsLogOutput(int flag) ; @@ -212,6 +199,7 @@ INLINE_HACK void rtsLogLevel(const char *level) extern int rtsLogAddFile(char *fname) ; +#ifdef RTS_ENABLE_LOG #ifdef RTS_LOG_COLORED #define LOG(SEV,STRING,ARGS...) \ @@ -242,16 +230,12 @@ INLINE_HACK void rtsLogLevel(const char *level) } while(0) \ - #endif /* RTS_LOG_COLORED */ - +#endif /* ENABLE LOG */ #endif /* __vxworks */ - -#endif /* RTS_ENABLE_LOG */ - #ifdef __cplusplus } -#endif +#endif /* __cplusplus */ #endif /* _RTS_LOG_H */ diff --git a/StRoot/RTS/src/LOG/rtsLogUnix.c b/StRoot/RTS/src/LOG/rtsLogUnix.c index 6d63e49c7ea..e02f1c8c3e7 100755 --- a/StRoot/RTS/src/LOG/rtsLogUnix.c +++ b/StRoot/RTS/src/LOG/rtsLogUnix.c @@ -30,23 +30,6 @@ volatile int tonkoLogLevel = 2 ; - - - -#ifdef RTS_ENABLE_LOG -#warning "DAQ logging is enabled" -#ifdef RTS_LOG_DEFAULT_NET -#warning "DAQ logging defaults to daqman" -#else -#warning "DAQ logging defaults to STDERR" -#endif /* RTS_LOG_DEFAULT_NET */ -#else -#warning "DAQ logging is disabled" -#endif /* RTS_ENABLE_LOG */ - - -#ifdef RTS_ENABLE_LOG - #ifdef RTS_LOG_DEFAULT_NET static int output_flag = RTS_LOG_NET ; #else @@ -391,11 +374,6 @@ static const char *getCmd(void) #endif } - -#endif - - - #ifdef __cplusplus } #endif diff --git a/mgr/Conscript-standard b/mgr/Conscript-standard index db1f9b9204b..ab1f1a4a7b1 100644 --- a/mgr/Conscript-standard +++ b/mgr/Conscript-standard @@ -197,7 +197,8 @@ if ( $pkg eq "Jevp") { . $main::PATH_SEPARATOR . "#OnlTools/Jevp/StJevpBuilders" . $main::PATH_SEPARATOR . "#OnlTools/Jevp/StJevpViewer" . $main::PATH_SEPARATOR . $CPPPATH; - $CPPFLAGS .= " -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_NO_DEBUG "; + $CPPFLAGS .= " -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_NO_DEBUG -DRTS_ENABLE_LOG "; + } #$CPPFLAGS .= " -DNEW_DAQ_READER -D__NO_STRANGE_MUDST__ "; @@ -1432,7 +1433,7 @@ if ( $#src > -1 ) { } } if ($pkg eq "RTS") { - my $cppflags = "-DRTS_PROJECT_STAR -DTPXREADER -DRTS_LITTLE_ENDIAN"; + my $cppflags = "-DRTS_PROJECT_STAR -DTPXREADER -DRTS_LITTLE_ENDIAN "; my $cpppath = $main::PATH_SEPARATOR . "#StRoot/RTS/include" . $main::PATH_SEPARATOR . "#StRoot/RTS/trg/include" . $main::PATH_SEPARATOR . "#StRoot/RTS/include/TPC"