Assorted updates to StRoot/RTS, including "char *" issue (star-bnl#406)

This updates the StRoot/RTS directories to solve issues with the
conversion between char * and const char *

Author: jml985

StRoot/RTS/include/DAQ1000/rb.hh

@@ -67,7 +67,7 @@ public:
 	int emu_fifo_length[128] ;
 	volatile rbFifo_t *sfifo, *rfifo ;	// same for fifos
 
-protected:
+//protected:
 
 	int board ;
 	int ch ;	// also port!

StRoot/RTS/include/fcfClass.hh

@@ -201,7 +201,7 @@ public:
 	int compare(u_int *p1[3], u_int *p2[3]) ;
 
 	void decode(u_int *data, fcfHit *h, u_int *sim = 0) ;	// utility: from FCF to local
-	void print_hit(char *, fcfHit *hit) ;	// utility
+	void print_hit(const char *, fcfHit *hit) ;	// utility
 
 	u_int do_swap ;		// 0=no, 1=yes => set by "burn"
 	u_int do_merge ;	// merge broken rows

StRoot/RTS/include/platform.h

@@ -467,7 +467,7 @@ extern MSG_Q_ID *pMsgQArray;
 inline void pSetupMsgQArray(MSG_Q_ID *qarray) {
   pMsgQArray = qarray;
 
-  LOG(DBG, "pMsgQArray = 0x%x",pMsgQArray,0,0,0,0);
+  LOG(DBG, "pMsgQArray = 0x%x",pMsgQArray,0,0,0,0); 
 }
 #endif
 

StRoot/RTS/include/rtsCfgL0Mask.h

@@ -0,0 +1,27 @@
+#ifndef _RTSCFGL0MASK_H_
+#define _RTSCFGL0MASK_H_
+
+#include <trgConfNum.h>
+#include <rtsSystems.h>
+
+#define MAX_TRG_DETS 20
+
+// Configuration file handling code
+struct TrgDetMask {
+    int id;                        // trigger id
+    char trgname[20];              // trigger name
+    //char name[MAX_CONF_NUM][20];   // crate names
+    UINT32 mask[MAX_CONF_NUM];     // mask
+};
+
+int readDetToTriggerCrateFile(TrgDetMask *masks);
+
+
+
+// The interface for the trigger nodes
+// -1 if error
+int configureTrgDetRequirements(int myConfNum);
+UINT32 getBoardMaskForTrgDet(UINT32 trgDetMask);
+
+
+#endif

StRoot/RTS/include/rtsLog.h

@@ -219,8 +219,8 @@ INLINE_HACK void rtsLogLevel(const char *level)
                 else if((tonkoLogLevel>3) && (*yada == 'E')) ; \
                 else if((tonkoLogLevel>4) && (*yada == 'O')) ; \
                 else { \
-			logMsg("" SEV ": " __FILE__ " [line %d]: " STRING "\n",__LINE__,(unsigned int)A1,(unsigned int)A2,(unsigned int)A3,(unsigned int)A4,(unsigned int)A5) ;\
-			sbLOG("" SEV ": " __FILE__ " [line %d]: " STRING "\n",__LINE__,(unsigned int)A1,(unsigned int)A2,(unsigned int)A3,(unsigned int)A4,(unsigned int)A5) ;\
+		    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) \
 

StRoot/RTS/include/rtsMonitor.h

@@ -427,7 +427,7 @@ struct rts2011EvbxSuperMon {
     u_int stream;	   // which stream evts sent to
   } trgs[TRIGGERS_MAX+1] ;
 
-  u_int detectorErrors[32];
+  u_int detectorErrors[RTS_NUM_SYSTEMS];
 };
 
 // new, FY13, slow controls monitoring (via scDeamon)

StRoot/RTS/include/rtsSystems.h

@@ -444,6 +444,9 @@ extern inline const char *getTrgDetBitName(int x) {
 #define TRG_EQ1_QTD_INSTANCE 36
 #define TRG_EQ2_QTD_INSTANCE 37
 #define TRG_EQ3_QTD_INSTANCE 38
+#define TRG_EQ4_QTD_INSTANCE 39
+
+#define TRG_EQ4_INSTANCE 40
 
 
 #define L3EVP_INSTANCE      1
@@ -625,6 +628,8 @@ extern inline const char *getTrgDetBitName(int x) {
 #define TRG_EQ3_NODE    ((TRG_SYSTEM<<12) | TRG_EQ3_INSTANCE)     // Rename EPQ > EQ3.  JMN 8/15/17
 #define TRG_EQ1_NODE    ((TRG_SYSTEM<<12) | TRG_EQ1_INSTANCE)     // Rename FQ1 > EQ1.  JMN
 #define TRG_EQ2_NODE    ((TRG_SYSTEM<<12) | TRG_EQ2_INSTANCE)     // Rename FQ2 > EQ2.  JMN
+#define TRG_EQ4_NODE    ((TRG_SYSTEM<<12) | TRG_EQ4_INSTANCE)
+
 #define TRG_STP2_NODE   ((TRG_SYSTEM<<12) | TRG_STP2_INSTANCE)
 #define TRG_L1_DSM2_NODE ((TRG_SYSTEM<<12) | TRG_L1_DSM2_INSTANCE)
 #define TRG_BBC_DSM2_NODE ((TRG_SYSTEM<<12) | TRG_BBC_DSM2_INSTANCE)

StRoot/RTS/src/DAQ_BSMD/bsmdPed.cxx

@@ -339,16 +339,16 @@ int bsmdPed::to_evb(char *buff)
 	return ((char *)dta-buff) ;
 }
 
-int bsmdPed::from_cache(char *fname) 
+int bsmdPed::from_cache(const char *fname) 
 {
 	FILE *f ;
-	char *fn ;
+	const char *fn ;
 
 	init(0x3F) ;	// to clear ped storage for all 6 RDOs
 
 	// trivial load from disk...
 	if(fname) {
-		fn = fname ;
+	        fn = fname ;
 		f = fopen(fname,"r") ;
 	}
 	else {
@@ -391,11 +391,11 @@ int bsmdPed::from_cache(char *fname)
 	return valid ;
 }
 
-int bsmdPed::to_cache(char *fname, u_int run)
+int bsmdPed::to_cache(const char *fname, u_int run)
 {
 	FILE *f ;
 	int r, p, t ;
-	char *fn ;
+	const char *fn ;
 
 
 	if(!valid) {
@@ -404,7 +404,7 @@ int bsmdPed::to_cache(char *fname, u_int run)
 	}
 
 	if(fname) {
-		fn = fname ;
+	        fn = fname ;
 	}
 	else {
 		fn = "/RTScache/pedestals.txt" ;

StRoot/RTS/src/DAQ_BSMD/bsmdPed.h

@@ -26,8 +26,8 @@ class bsmdPed {
 	int do_zs(char *src, int in_bytes, char *dst, int rdo1, u_int *adc_sum=0) ;
 	int to_evb(char *buff) ;			// to EVB format from ped_store
 
-	int from_cache(char *fname = 0) ;		// from cached file to ped_store
-	int to_cache(char *fname = 0, u_int run = 0) ;			// to cached file from ped_store
+	int from_cache(const char *fname = 0) ;		// from cached file to ped_store
+	int to_cache(const char *fname = 0, u_int run = 0) ;			// to cached file from ped_store
 
 	int special_setup(int run_type, int sub_type) ;
 

StRoot/RTS/src/DAQ_BSMD/daq_bsmd.cxx

@@ -352,7 +352,7 @@ daq_dta *daq_bsmd::handle_ped_rms(int rdo, int is_ped)
 			full_name = caller->get_sfs_name(str) ;
 
 			if(!full_name) continue ;
-
+			
 			l_bytes = caller->sfs->fileSize(full_name) ;
 
 			bytes += l_bytes ;