star-bnl · plexoos · May 28, 2025 · May 28, 2025 · Jun 10, 2021 · May 28, 2025
diff --git a/StRoot/StiMaker/StiDefaultToolkit.h b/StRoot/StiMaker/StiDefaultToolkit.h
@@ -17,6 +17,8 @@
 #define StiDefaultToolkit_H 1
 #include "Sti/StiToolkit.h"
 
+class StiTrackMerger;
+
 /** 
  * @class StiDefaultToolkit
  * @brief Definition of toolkit

diff --git a/asps/rexe/Conscript b/asps/rexe/Conscript
@@ -79,9 +79,7 @@ if ($FC =~ /^pgf/) {
 }
 $LIBS .= " -lgeant321 -lgcalor"; 
 $LIBS  .= " " . $env->{CERNLIBS};
-$LIBS  .= $env->{LDALL};
 $LIBS  .= " " . $env->{Packages}->{MYSQL}->{LIBS};
-$LIBS  .= $env->{LDNONE};
 $LIBS  .= " " . $FLIBS . " " . $env->{CLIBS};#   " " . $env->{SYSLIBS} ;
 if ($STAR_SYS =~ /^sun4x_5.$/) {
     if ($LIBPATH) { $LIBPATH .= $main::PATH_SEPARATOR; }

diff --git a/mgr/ConsDefs.pm b/mgr/ConsDefs.pm
@@ -142,12 +142,10 @@
 	}
 
 	$G77FLAGS .= " -std=legacy -fno-second-underscore -w -fno-automatic -Wall -W -Wsurprising -fPIC";
-	$FFLAGS    = $G77FLAGS;
-	$FLIBS     = "-lgfortran";
-#	$FLIBS      = `$FC $FFLAGS -print-file-name=libgfortran.$SOEXT`; chomp($FLIBS);
-#	if ($FLIBS eq "libgfortran.$SOEXT") {
-#	  $FLIBS    = `$FC $FFLAGS -print-file-name=libgfortran.a`; chomp($FLIBS);
-#	}
+
+	$FFLAGS    = $G77FLAGS;     # will be overwritten below, ignore
+	$FLIBS     = "-lgfortran -lquadmath";
+
     } else {
 	$G77       = "g77";
 	$G77FLAGS  = "$XMACHOPT -fno-second-underscore -w -fno-automatic -Wall -W -Wsurprising -fPIC";
@@ -200,7 +198,7 @@
     $STIC          = "stic";
     $STICFLAGS     = "";
     $AGETOF        = "agetof";
-    $AGETOFLAGS    = "-V 1";
+    $AGETOFLAGS    = "-V 1 -d $STAR_BIN/agetof.def";
     $LIBSTDC       = `$CC $CFLAGS -print-file-name=libstdc++.a | awk '{ if (\$1 != "libstdc++.a") print \$1}'`;
     chomp($LIBSTDC);
 
@@ -917,107 +915,31 @@
     #
     # *** Standard package first, then XOPTSTAR ***
     #	
-    my ($MYSQLINCDIR,$mysqlheader);
-    if ( defined($ENV{USE_LOCAL_MYSQL}) ){
-	($MYSQLINCDIR,$mysqlheader) =
-	    script::find_lib( $XOPTSTAR . "/include " .  $XOPTSTAR . "/include/mysql ".
-			      $MYSQL . " " .
-			      "/sw/include/mysql ".
-			      "/include /usr/include ".
-			      "/usr/include/mysql  ".
-			      "/usr/mysql/include  ".
-			      "/usr/mysql  ",
-			      "mysql.h");
-    } else { 
-	($MYSQLINCDIR,$mysqlheader) =
-	    script::find_lib( $MYSQL . " " .
-			      "/sw/include/mysql ".
-			      "/include /usr/include ".
-			      "/usr/include/mysql  ".
-			      "/usr/mysql/include  ".
-			      "/usr/mysql  ".
-			      $XOPTSTAR . "/include " .  $XOPTSTAR . "/include/mysql " ,
-			      "mysql.h");
-    }
 
-    if (! $MYSQLINCDIR) {
-	die "Can't find mysql.h in standard path and $XOPTSTAR/include  $XOPTSTAR/include/mysql\n";
-    }
 
     # search for the config    
-    my ($MYSQLCONFIG,$mysqlconf);
-    # if ( defined($ENV{USE_LOCAL_MYSQL}) ){
-	($MYSQLCONFIG,$mysqlconf) =
-	    script::find_lib($XOPTSTAR . "/bin " .  $XOPTSTAR . "/bin/mysql ".
-			     $MYSQL . " ".
-			     "/usr/$LLIB/mysql /usr/bin/mysql /usr/bin ",
-			     "mysql_config");
-    # } else {
-    #	($MYSQLCONFIG,$mysqlconf) =
-    #	    script::find_lib($MYSQL . " ".
-    #			     "/usr/$LLIB/mysql /usr/bin/mysql /usr/bin ".
-    #			     $XOPTSTAR . "/bin " .  $XOPTSTAR . "/bin/mysql ",
-    #			     "mysql_config");
-    # } 
-
-
-    # Associate the proper lib with where the inc was found
-    my ($mysqllibdir)=$MYSQLINCDIR;
-    $mysqllibdir =~ s/include/$LLIB/;
-
-    # print "DEBUG :: $mysqllibdir\n";
-    # Note - there is a trick here - the first element uses mysqllibdir
-    #        which is dreived from where the INC is found hence subject to 
-    #        USE_LOCAL_MYSQL switch. This may not have been obvious.
-    # my ($MYSQLLIBDIR,$MYSQLLIB) =
-    #	script::find_lib($mysqllibdir . " /usr/$LLIB/mysql ".
-    #			 $XOPTSTAR . "/lib " .  $XOPTSTAR . "/lib/mysql ",
-    #			 "libmysqlclient");
-    #			 # "libmysqlclient_r libmysqlclient");
-    # # die "*** $MYSQLLIBDIR,$MYSQLLIB\n";
-
-    # if ($STAR_HOST_SYS =~ /^rh/ or $STAR_HOST_SYS =~ /^sl/) {
-    if ( $mysqlconf ){
-	$mysqlconf = "$MYSQLCONFIG/$mysqlconf";
-	# if ( 1==1 ){
-	# Do not guess, just take it - this leads to a cons error though TBC
-	chomp($MYSQLLIB = `$mysqlconf  --libs`);
-	# but remove -L which are treated separately by cons
-	my(@libs) = split(" ", $MYSQLLIB);
-	my($test) = shift(@libs);
-	if ( $test =~ /-L/){
-	    $MYSQLLIBDIR = $test; $MYSQLLIBDIR =~ s/-L//;
-	    $MYSQLLIB = "";
-	    foreach my $el (@libs){
-		$MYSQLLIB  .= " ".$el if ($el !~ m/-L/);
-	    }
-	}
-
-	# here is a check for libmysqlclient
-
-
-	# die "DEBUG got $MYSQLLIBDIR $MYSQLLIB\n";
-
-	# mysqlconf returns (on SL5, 64 bits)
-	#  -L/usr/lib64/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -L/usr/lib64 -lssl -lcrypto
-	# } else {
-	#    $MYSQLLIB .= " -L/usr/$LLIB";
-	#    if (-r "/usr/$LLIB/libmystrings.a") {$MYSQLLIB .= " -lmystrings";}
-	#    if (-r "/usr/$LLIB/libssl.a"      ) {$MYSQLLIB .= " -lssl";}
-	#    if (-r "/usr/$LLIB/libcrypto.a"   ) {$MYSQLLIB .= " -lcrypto";}
-	#    if ( $MYSQLLIB =~ m/client_r/     ) {$MYSQLLIB .= " -lpthread";}
-	#    # if (-r "/usr/$LLIB/libk5crypto.a" ) {$MYSQLLIB .= " -lcrypto";}
-	#    $MYSQLLIB .= " -lz";
-	#    # $MYSQLLIB .= " -lz -lcrypt -lnsl";
-	# }
-    } else {
-	die "No mysql_config found\n";
+    chomp(my $mysqlconf = `which mysql_config`);
+
+    if ($?) {
+        die "No mysql_config found\n";
     }
-    print "Using $mysqlconf\n\tMYSQLINCDIR = $MYSQLINCDIR MYSQLLIBDIR = $MYSQLLIBDIR  \tMYSQLLIB = $MYSQLLIB\n"
-          if ! $param::quiet;
 
-    # die "\n";
+    chomp(my $MYSQLINCDIR = `mysql_config --variable=pkgincludedir`);
+    chomp(my $MYSQLLIBDIR = `mysql_config --variable=pkglibdir`);
+
+    chomp(my $MYSQLLIB = `$mysqlconf --libs`);
+    # Remove -L which are treated separately by cons
+    my(@libs) = split(" ", $MYSQLLIB);
+    my($test) = shift(@libs);
+    if ( $test =~ /-L/) {
+        $MYSQLLIBDIR = $test; $MYSQLLIBDIR =~ s/-L//;
+        $MYSQLLIB = "";
+        foreach my $el (@libs) {
+            $MYSQLLIB  .= " ".$el if ($el !~ m/-L/);
+        }
+    }
 
+    print "Using $mysqlconf\n\tMYSQLINCDIR = $MYSQLINCDIR\n\tMYSQLLIBDIR = $MYSQLLIBDIR\n\tMYSQLLIB = $MYSQLLIB\n" if !$param::quiet;
 
 
     # QT
@@ -1115,65 +1037,62 @@
     }
 
     # Logger
-    $LoggerDir = $XOPTSTAR . "/include/log4cxx";
-
-    if (-d $LoggerDir) {
-	$LoggerINCDIR = $XOPTSTAR . "/include";
-	$LoggerLIBDIR = $XOPTSTAR . "/lib";
-	$LoggerLIBS   = "-llog4cxx";
-	print
-	    "Use Logger  ",
-	    "LIBDIR = $LoggerLIBDIR \tLoggerINCDIR = $LoggerINCDIR \tLoggerLIBS = $LoggerLIBS\n"
-	    if $LoggerLIBDIR && ! $param::quiet;
+    chomp($LoggerDir = `pkg-config --variable=prefix liblog4cxx`);
+    $LoggerDir = $MYSTAR unless $LoggerDir;
+
+    if (not -d $LoggerDir."/include/log4cxx") {
+        die "No log4cxx found\n";
     }
+
+    $LoggerINCDIR = $LoggerDir . "/include";
+    $LoggerLIBDIR = $LoggerDir . "/lib";
+    $LoggerLIBS   = "-llog4cxx";
+
+    print "Using $LoggerDir\n\tLoggerLIBDIR = $LoggerLIBDIR\n\tLoggerINCDIR = $LoggerINCDIR\n\tLoggerLIBS = $LoggerLIBS\n" unless $param::quiet;
+
     # xml2
-    my  ($XMLINCDIR,$XMLLIBDIR,$XMLLIBS) = ("","","");
-    my ($xml) =  script::find_lib($XOPTSTAR . "/bin /usr/bin",
-				  "xml2-config");
-    if ($xml) {
-	$xml .= "/xml2-config";
-	$XMLINCDIR = `$xml --cflags`;
-	chomp($XMLINCDIR);
-	$XMLINCDIR =~ s/-I//;
-	my $XML  = `$xml --libs`; # die "$XML\n";
-	my(@libs)= split(" ", $XML);
-
-	$XMLLIBDIR = shift(@libs);
-	if ($XMLLIBDIR =~ /-L/){
-	    $XMLLIBDIR =~ s/-L//;
-	    $XMLLIBS   = join(" ",@libs);
-	} else {
-	    # no -L, assume all were LIBS
-	    $XMLLIBS   = $XMLLIBDIR ." ".join(" ",@libs);
-	    # and fix -L / should work for both 32 and 64
-	    $XMLLIBDIR = "/usr/$LLIB";
-	}
+    chomp(my $xml = `which xml2-config`);
 
+    if ($?) {
+        die "No xml2-config found\n";
+    }
 
-	# ($XMLLIBDIR,$XMLLIBS) = split(' ', $XML);
-	# if ($XMLLIBDIR =~ /-L/){
-	#    $XMLLIBDIR =~ s/-L//;
-	# } else {
-	#    # may not have any -L
-	#    if ($XMLLIBS
-	# }
+    my  ($XMLINCDIR,$XMLLIBDIR,$XMLLIBS) = ("","","");
 
-	my $XMLVersion = `$xml --version`;            # print "XMLVersion = $XMLVersion\n";
-	my ($major,$minor) = split '\.', $XMLVersion; # print "major = $major,minor = $minor\n";
-	$XMLCPPFlag = "";#-DXmlTreeReader";
-	if ($major < 2 or $major == 2 and $minor < 5) {
-	    $XMLCPPFlag = "-DNoXmlTreeReader";
-	}
-	if ( ! $param::quiet ){
-	    if ( $XMLLIBDIR ){
-		print "Use xml $xml XMLLIBDIR = $XMLLIBDIR \tXMLINCDIR = $XMLINCDIR \tXMLLIBS = $XMLLIBS XMLCPPFlag =$XMLCPPFlag\n";
-	    } else {
-		print "Use xml -> WARNING ** Could not define XMLLIBDIR, XMLINCDIR, XMLLIBS\n";
-	    }
-	}
+    $XMLINCDIR = `$xml --cflags`;
+    chomp($XMLINCDIR);
+    $XMLINCDIR =~ s/-I//;
+    my $XML  = `$xml --libs`; # die "$XML\n";
+    my(@libs)= split(" ", $XML);
+
+    $XMLLIBDIR = shift(@libs);
+    if ($XMLLIBDIR =~ /-L/){
+        $XMLLIBDIR =~ s/-L//;
+        $XMLLIBS   = join(" ",@libs);
     } else {
-	print "Could not find xml libs\n" if (! $param::quiet);
+        # no -L, assume all were LIBS
+        $XMLLIBS   = $XMLLIBDIR ." ".join(" ",@libs);
+        # and fix -L / should work for both 32 and 64
+        $XMLLIBDIR = "/usr/$LLIB";
+    }
+
+    my $XMLVersion = `$xml --version`;            # print "XMLVersion = $XMLVersion\n";
+    my ($major,$minor) = split '\.', $XMLVersion; # print "major = $major,minor = $minor\n";
+    $XMLCPPFlag = "";#-DXmlTreeReader";
+    if ($major < 2 or $major == 2 and $minor < 5) {
+        $XMLCPPFlag = "-DNoXmlTreeReader";
     }
+    if ( ! $param::quiet ){
+        if ( $XMLLIBDIR ){
+            print "Using $xml\n\tXMLLIBDIR = $XMLLIBDIR\n\tXMLINCDIR = $XMLINCDIR\n\tXMLLIBS = $XMLLIBS\n\tXMLCPPFlag = $XMLCPPFlag\n" if !$param::quiet;
+        } else {
+            print "Use xml -> WARNING ** Could not define XMLLIBDIR, XMLINCDIR, XMLLIBS\n";
+        }
+    }
+
+    chomp($FASTJET_PREFIX = `fastjet-config --prefix`);
+    chomp($GSL_PREFIX = `gsl-config --prefix`);
+
  #Vc check SSE support
  my $cmd = "touch temp_gccflags.c; $CXX -E -dM -o - temp_gccflags.c | grep -q SSE";
  my $VcCPPFLAGS = " -DVC_IMPL=SSE";
@@ -1287,7 +1206,9 @@
 		      },
 		  'SUFOBJ' => "." . $O,
 		  'ENV'    => {
+		      'CPATH'           => $CPATH,
 		      'PATH'            => $PATH,
+		      'PYTHONPATH'      => $PYTHONPATH,
 		      'LM_LICENSE_FILE' => $LM_LICENSE_FILE,
 		      'INCLUDE'         => $INCLUDE_PATH,
 		      'ROOT'            => $ROOT,
@@ -1331,6 +1252,12 @@
 			    'CPPFLAGS' => $CERNLIB_CPPFLAGS,
 			    'CERNLIBS' => $CERNLIBS
 			    },
+                       'FASTJET' => {
+                           'INCDIR'=> "$FASTJET_PREFIX/include"
+                           },
+                       'GSL' => {
+                           'INCDIR'=> "$GSL_PREFIX/include"
+                           },
 		       'MYSQL' => {
 			   'LIBDIR'=> $MYSQLLIBDIR,
 			   'INCDIR'=> $MYSQLINCDIR,

diff --git a/mgr/Construct b/mgr/Construct
@@ -364,17 +364,15 @@ my @sysdirlist = qw(asps/Simulation/agetof
 if ($STAR_SYS !~ /x86_darwin/) {
   push @sysdirlist, "asps/DAQBrowser";
 }
-if (!($USE_64BITS and $USE_64BITS != "0") && $STAR_SYS !~ /x86_darwin/){
-  push @sysdirlist, "asps/Simulation/geant321";
-  push @sysdirlist, "asps/Simulation/gcalor";
-  push @sysdirlist, "asps/rexe";
-  push @sysdirlist, "asps/Simulation/starsim";
-  if ($STAR_HOST_SYS !~ /sl61_gcc445/) {# broken Qt
-    push @sysdirlist, "OnlTools/OnlinePlots";
-    push @sysdirlist, "OnlTools/PDFUtil";
-    push @sysdirlist, "OnlTools/StOnlineDisplay";
-    push @sysdirlist, "OnlTools/Jevp";
-  }
+push @sysdirlist, "asps/Simulation/geant321";
+push @sysdirlist, "asps/Simulation/gcalor";
+push @sysdirlist, "asps/rexe";
+push @sysdirlist, "asps/Simulation/starsim";
+if ($STAR_HOST_SYS !~ /sl61_gcc445/) {# broken Qt
+  push @sysdirlist, "OnlTools/OnlinePlots";
+  push @sysdirlist, "OnlTools/PDFUtil";
+  push @sysdirlist, "OnlTools/StOnlineDisplay";
+  push @sysdirlist, "OnlTools/Jevp";
 }
 
 #print "sysdirlist = @sysdirlist \n subdirs = @subdirs\n";

diff --git a/pams/gen/idl/eg_event.idl b/pams/gen/idl/eg_event.idl
@@ -0,0 +1,30 @@
+/* eg_event.idl - Event Generator event table */
+
+struct eg_event {	   /*VENUS     Description                           */
+   long   n_event;         /*nrevt     eg event number                       */
+   float  b_impact;        /*bimevt    actual impact parameter               */
+   float  phi_impact;      /*phievt    reaction plane                        */
+/* long   event_type;                  trigger, minbias bkgd, cosmic, etc.   */
+/* long   polarization_evt[10];        to be defined                         */
+/* long   n_part_prot_east;            number of participant protons         */
+/* long   n_part_neut_east;            number of participant neutrons        */
+/* long   n_part_prot_west;            number of participant protons         */
+/* long   n_part_neut_west;            number of participant neutrons        */
+   long   n_track;         /*nptls     # tracks                              */
+   long   n_vertex;        /*ivtxs     # vertices                            */
+/* long   n_fs_track;                  # final state tracks                  */
+/* long   n_not_fs_track;              # non-final state tracks              */
+/* long   n_primary_vertex;            # primary vertices                    */
+/* long   n_fs_vertex;                 # non-final state vertices            */
+/* struct eg_vertex_t   *p_first_primary_vertex; ptr to ll of primary verts  */
+/* struct eg_vertex_t   *p_first_fs_vertex;      ptr to ll of fin. state vert*/
+};
+
+/* Latest revision - $Date: 1997/01/08 21:15:08 $ */
+/*
+
+05dec96 - cetull
+	This table is derived from VENUS and GSTAR internal structures and
+	variables.
+
+*/
diff --git a/pams/gen/idl/eg_gener.idl b/pams/gen/idl/eg_gener.idl
@@ -0,0 +1,27 @@
+/* eg_gener.idl - Event Generator generator table */
+
+struct eg_gener {        /*VENUS       Description                           */
+/* long     generator;                 event generator identification        */
+   char     eg_name[32]; /*            event generator name                  */
+   float    eg_version;  /*            version of event generator            */
+/* long     eg_run;                    generator run number                  */
+/* long     eg_rndm[2];                generator random numbers              */
+   float    sqrts;       /*engy        center of mass energy                 */
+/* long     is_minbias;                minimum bias flag                     */
+/* float    b_min;                     minimum impact parameter              */
+   float    b_max;       /*bmaxim      maximum impact parameter              */
+   long     east_a;      /*maproj      projectile 1 mass number              */
+   long     east_z;      /*laproj      projectile 1 charge                   */
+   long     west_a;      /*matarg      projectile 2 mass number              */
+   long     west_z;      /*latarg      projectile 2 charge                   */
+/* long     polarization_run[10];      to be defined                         */
+};
+
+/* Latest revision - $Date: 1997/01/08 21:15:11 $ */
+/*
+
+05dec96 - cetull
+	This table is derived from VENUS and GSTAR internal structures and
+	variables.
+
+*/