From fd34e56a335ad25bdba1b8ffff643d2b0215d046 Mon Sep 17 00:00:00 2001 From: klendathu2k Date: Fri, 11 Mar 2022 12:29:29 -0500 Subject: [PATCH 1/3] This PR fixes #324. Before submitting PR#315 some code cleanup was performed (see note below). The fast jet directory was moved from StarGenerator/FastJetFilt to StarGenerator/FILT/FastJetFilt, to conform with the standard source tree layout for filters. https://github.com/klendathu2k/star-sw-1/commit/4f270342c76226ae6e33e732cad06fad37d1b10e https://github.com/klendathu2k/star-sw-1/commit/625bbddaa2990946c57a9d6014c164378d7c4b32 Conscript-standard directory rules allow one to specify include paths based on the module (StarGenerator) and package. The package is one directory beneath the module... before code cleanup this was the FastJetFilter directory. After cleanup, we have to apply the fast jet include path to all filters in the StarGenerator/FILT directory. ---- Note on the pp 200 HF filtered jet production. The production commenced with fast jet filter code built before code cleanup, based on the original location of the fast jet filter in the source tree. --- mgr/Conscript-standard | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mgr/Conscript-standard b/mgr/Conscript-standard index a2044a659b9..d3577283620 100644 --- a/mgr/Conscript-standard +++ b/mgr/Conscript-standard @@ -63,7 +63,7 @@ if ( ($Dir =~ m/StRoot.*Pool\// && $Dir !~ /StRoot.*Pool\/St/) || # normal case, use subdir name $pkg =~ s/.*StarGenerator\///; } - #print "\t[".File::Basename::basename($Dir)."] changed to $pkg\n"; + print "\t[".File::Basename::basename($Dir)."] changed to $pkg\n"; } else { $pkg =~ s/Pool\//Pool/ if ($pkg =~ m/Pool/ ); $pkg =~ s/Client\//Client/ if ($pkg =~ m/Client/); @@ -568,14 +568,16 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) { print "CPPPATH = $CPPPATH\n" if $param::debug; - } elsif ( $pkg =~ m/^FastJetFilter/ and $Dir =~ m/StarGenerator/ ){ - + } elsif ( $pkg =~ m/^StarGeneratorFilt/ and $Dir =~ m/StarGenerator/ ){ + # Package FILT is transformed to StarGeneratorFilt by StarGenerator directory rules + # We cannot narrow down futher..., so all filters will be built with the + # following dependencies... if ( defined($ENV{FASTJET_DIR}) ) { $CPPPATH = $ENV{FASTJET_DIR}."/include".$main::PATH_SEPARATOR.$CPPPATH; } else { - $CPPPATH = $env1->{ENV}->{OPTSTAR}."/include".$main::PATH_SEPARATOR.$CPPPATH; + $CPPPATH = $env1->{ENV}->{OPTSTAR}."/include".$main::PATH_SEPARATOR.$CPPPATH; } - + } elsif ( $pkg =~ m/^Pythia8/ and $Dir =~ m/StarGenerator/ ){ # Append pythia 8 include path and define version #print "***** DEBUG ****\n"; From f0c9c0aed77715e430fdee53c8725aab5f959c72 Mon Sep 17 00:00:00 2001 From: klendathu2k Date: Fri, 11 Mar 2022 12:49:03 -0500 Subject: [PATCH 2/3] Remove debug statement --- mgr/Conscript-standard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mgr/Conscript-standard b/mgr/Conscript-standard index d3577283620..674b2357834 100644 --- a/mgr/Conscript-standard +++ b/mgr/Conscript-standard @@ -63,7 +63,7 @@ if ( ($Dir =~ m/StRoot.*Pool\// && $Dir !~ /StRoot.*Pool\/St/) || # normal case, use subdir name $pkg =~ s/.*StarGenerator\///; } - print "\t[".File::Basename::basename($Dir)."] changed to $pkg\n"; + # print "\t[".File::Basename::basename($Dir)."] changed to $pkg\n"; } else { $pkg =~ s/Pool\//Pool/ if ($pkg =~ m/Pool/ ); $pkg =~ s/Client\//Client/ if ($pkg =~ m/Client/); From 0765f0d52baa47ea5041a75368f255cb13912fdb Mon Sep 17 00:00:00 2001 From: klendathu2k Date: Thu, 10 Nov 2022 16:20:33 -0500 Subject: [PATCH 3/3] The EventQA option has a dependence on the MuDst library. To demonstrate: root [0] .L bfc.C root [1] bfc(-1,"EventQA nodefault") --- StRoot/StBFChain/BigFullChain.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StRoot/StBFChain/BigFullChain.h b/StRoot/StBFChain/BigFullChain.h index 1b94a53b772..a1dc2e540a2 100644 --- a/StRoot/StBFChain/BigFullChain.h +++ b/StRoot/StBFChain/BigFullChain.h @@ -2006,7 +2006,7 @@ Bfc_st BFC[] = { // standard chains {"ppDAQfilter1","","","" ,"","",STAR_CHAIN_OBSOLETE,kFALSE}, {"ppLPeval1" ,"","","" ,"","",STAR_CHAIN_OBSOLETE,kFALSE}, {"QA" ,"","","" ,"","",STAR_CHAIN_OBSOLETE,kFALSE}, - {"EventQA","EventQA","","QUtils,Event","StEventQAMaker" ,"St_QA_Maker","Filling Y2/Y3 Qa histo",kFALSE}, + {"EventQA","EventQA","","QUtils,Event,MuDST","StEventQAMaker" ,"St_QA_Maker","Filling Y2/Y3 Qa histo",kFALSE}, {"QAC" ,"CosmicsQA","globT","" ,"StQACosmicMaker","StQACosmicMaker","",kFALSE}, {"QAalltrigs" ,"", "","", "","","Analyze all triggers in QA",kFALSE}, {"HitFilt" ,"", "","", "StHitFilterMaker","StHitFilterMaker","Hit filter Maker",kFALSE},