Merge branch 'main' into Centrality_Run_20_21

star-bnl · Apr 18, 2024 · 52e8fcc · 52e8fcc
2 parents 88cf1d2 + 5bc6193
commit 52e8fcc
Show file tree

Hide file tree

Showing 37 changed files with 1,189 additions and 279 deletions.
diff --git a/OnlTools/Jevp/StJevpBuilders/fttBuilder.cxx b/OnlTools/Jevp/StJevpBuilders/fttBuilder.cxx
@@ -439,10 +439,17 @@ void fttBuilder::drawStrip( TH2 * h2, int row, int strip, VMMHardwareMap::Quadra
 
         int ix0 = ax->FindBin( x0 + row * rLength );
         int ix1 = ax->FindBin( x0 + (row + 1) * rLength - 1 );
+
+	/*   This code does nothing! ----------------------
+	     Most likely it was intended to adjust the indexes for this specific
+	     region of the detector, but not known if needed;   -jml 3/25/24
+
         if ( VMMHardwareMap::Quadrant::C == q || VMMHardwareMap::Quadrant::D == q ){
             int ix0 = ax->FindBin( x0 + (row - 1) * rLength );
             int ix1 = ax->FindBin( x0 + (row) * rLength - 1 );
         }
+	*/
+
         const int iy0 = ay->FindBin( y0 + strip * sPitch );
         const int iy1 = ay->FindBin( y0 + (strip) * sPitch );
         floodFill( h2, ix0, iy0, ix1, iy1 );

diff --git 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
@@ -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/DAQ_FCS/fcs_data_c.cxx b/StRoot/RTS/src/DAQ_FCS/fcs_data_c.cxx
@@ -39,6 +39,7 @@ u_int fcs_data_c::run_type ;
 
 // for ZS
 float fcs_data_c::n_sigma ;
+float fcs_data_c::n_sigma_hcal ;
 float fcs_data_c::n_sigma_epd ;
 short fcs_data_c::n_pre ;
 short fcs_data_c::n_post ;
@@ -267,6 +268,7 @@ int fcs_data_c::zs_start(u_short *buff)
 	float sigma ;
 
 	if(hdr_det==2) sigma = n_sigma_epd ;
+	else if(hdr_det==1) sigma = n_sigma_hcal ;
 	else sigma = n_sigma ;
 
 	// trigger channels are special so figure this out

diff --git a/StRoot/RTS/src/DAQ_FCS/fcs_data_c.h b/StRoot/RTS/src/DAQ_FCS/fcs_data_c.h
@@ -36,6 +36,7 @@ class fcs_data_c {
 		run_number = 0 ;
 
 		n_sigma = 4.0 ;
+		n_sigma_hcal = 4.0 ;
 		n_sigma_epd = 4.0 ;
 		n_pre = 8 ;
 		n_post = 8 ;
@@ -235,6 +236,7 @@ class fcs_data_c {
 	// for ZS
 	static float n_sigma ;
 	static float n_sigma_epd ;
+	static float n_sigma_hcal ;
 	static short n_pre ;
 	static short n_post ;
 	static short n_cou ;

diff --git a/StRoot/RTS/src/DAQ_ITPC/daq_itpc.cxx b/StRoot/RTS/src/DAQ_ITPC/daq_itpc.cxx
@@ -76,10 +76,8 @@ daq_itpc::daq_itpc(daqReader *rts_caller)
 
 	it23 = 0 ;	// assume we won't use it
 	online = 0 ;
+	mode = 0 ;
 
-//	it23 = new itpc23 ;	
-//	it23->no_cld = 1 ;
-//	it23->log_level = 2 ;
 
 	memset(fcf,0,sizeof(fcf)) ;
 	fcf_det_type = 1 ;	// ITPC
@@ -535,6 +533,7 @@ daq_dta *daq_itpc::handle_sampa(int sec, int rdo, int in_adc)
 				it23->run_type = 3 ;	// NO CLUSTER FINDER PLEASE
 				it23->no_cld = 1 ;
 				it23->log_level = 0 ;
+				it23->mode = mode ;
 			}
 			it23->data_c = &sampa_c ;
 
@@ -559,6 +558,10 @@ daq_dta *daq_itpc::handle_sampa(int sec, int rdo, int in_adc)
 			//LOG(WARN,"S%02d:%d: rdo_fmt %d -- scan will fail",s,r,rdo_fmt) ;
 			it23->set_rdo(s,r) ;
 			ret = it23->rdo_scan((char *)dta,words) ;
+
+			if((it23->err || ret) && mode) {
+				LOG(ERR,"S%02d:%d: rdo_scan 0x%X, err 0x%X, words %d",s,r,ret,it23->err,words) ;
+			}
 		}
 		else {
 			ret = it->rdo_scan_top(dta,words) ;

diff --git a/StRoot/RTS/src/DAQ_ITPC/daq_itpc.h b/StRoot/RTS/src/DAQ_ITPC/daq_itpc.h
@@ -74,6 +74,7 @@ class daq_itpc : public daq_det {
 	static int no_sw16 ;
 
 	int online ;
+	int mode ;
 	int rdo_fmt ;
 } ;
 

diff --git a/StRoot/RTS/src/DAQ_ITPC/itpcFCF.cxx b/StRoot/RTS/src/DAQ_ITPC/itpcFCF.cxx
@@ -1250,7 +1250,7 @@ int itpc_fcf_c::do_blobs_stage2(int row)
 
 			int b_ix = blob_ix[ix] ;
 
-			LOG(TERR,"  using bix %d %d",ix,b_ix) ;
+			//LOG(TERR,"  using bix %d %d",ix,b_ix) ;
 			if(b_ix != ix) {
 				LOG(WARN,"Can't be: %d %d, RP %d:%d",b_ix,ix,row,p) ;
 			}
@@ -1347,7 +1347,7 @@ int itpc_fcf_c::do_blobs_stage2(int row)
 
 
 
-#if 1
+#if 0
 	LOG(TERR,"Blobs OK %d/%d in row %d",blob_ok,blob_cou,row) ;
 
 	for(int i=0;i<blob_cou;i++) {
@@ -1975,25 +1975,25 @@ int itpc_fcf_c::do_row_check(int row)
 	}
 
 	for(int i=1;i<blob_cou;i++) {
-		LOG(TERR,"blob_ix[%d] = %d",i,blob_ix[i]) ;
+	    LOG(DBG,"blob_ix[%d] = %d",i,blob_ix[i]) ;
 
 	}
 
 	for(int i=1;i<blob_cou;i++) {
 		if(blob[i].cou) {
-			LOG(TERR," Blob %d: %d",i,blob[i].cou) ;
+		    LOG(DBG," Blob %d: %d",i,blob[i].cou) ;
 			max_ix++ ;
 		}
 	}
 
 	for(int i=1;i<max_ix;i++) {
 		if(blob[i].merges) {
-			LOG(TERR,"blob %d: merged %d",i,blob[i].merges) ;
+			LOG(DBG,"blob %d: merged %d",i,blob[i].merges) ;
 		}
 	}
 
 
-	LOG(TERR,"Final blob count %d/%d",max_ix,blob_cou) ;
+	LOG(DBG,"Final blob count %d/%d",max_ix,blob_cou) ;
 
 	return 0 ;
 

diff --git a/StRoot/RTS/src/DAQ_STGC/stgc_data_c.cxx b/StRoot/RTS/src/DAQ_STGC/stgc_data_c.cxx
@@ -349,6 +349,18 @@ int stgc_data_c::event_0001()
 
 	feb_id = dd>>29 ;
 
+#if 0
+	if(rdo1==2) {
+		switch(feb_id) {
+		case 1 :
+		case 3 :
+		case 5 :
+			LOG(WARN,"%d: FEB %d\n",rdo1,feb_id) ;
+			break ;
+		}
+	}
+#endif
+
 	datum_ix++ ;
 
 
@@ -732,6 +744,8 @@ int stgc_data_c::event()
 	}
 	else {
 
+//		printf("%d: ROD %d, FEB %d\n",rdo1,rod_id,feb_id) ;
+
 		vmm.feb_vmm = ((feb_id-1)<<2)|(vmm_id-4) ;
 		vmm.ch = channel ;
 		vmm.adc = pdo ;