update bco verification jobs

jestinaxsmith · Oct 4, 2024 · 6b481a6 · 6b481a6
1 parent 6b340d6
commit 6b481a6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/BcoQA/condor/Fun4All_InttQA.C b/BcoQA/condor/Fun4All_InttQA.C
@@ -16,7 +16,9 @@ void Fun4All_InttQA(int nEvents = 0,
   Fun4AllServer *se = Fun4AllServer::instance();
 //  se->Verbosity(1);
 
-  se->registerSubsystem(new InttBcoDump);
+  InttBcoDump *inttdmp = new InttBcoDump;
+  inttdmp->OutFileName(outfile);
+  se->registerSubsystem(inttdmp);
 
   Fun4AllInputManager *in = new Fun4AllPrdfInputManager("PRDFin");
   in->AddListFile(input_list);
@@ -26,8 +28,6 @@ void Fun4All_InttQA(int nEvents = 0,
 
   se->End();
 
-  QAHistManagerDef::saveQARootFile(outfile);
-
   delete se;
   std::cout <<"Finished"<<std::endl;
   gSystem->Exit(0);

diff --git a/BcoQA/condor/condor.job b/BcoQA/condor/condor.job
@@ -9,7 +9,7 @@ PeriodicHold 	= (NumJobStarts>=1 && JobStatus == 1)
 #accounting_group = group_sphenix.mdc2
 #accounting_group_user = sphnxpro
 #Requirements = (CPU_Type == "mdc2")
-#request_memory = 5120MB
+#request_memory = 4096MB
 #Priority = $(baseprio)
 job_lease_duration = 3600
 Queue executable, infile, outlfn, outdir, outfile, errfile, condorlogfile, rundir from condor.list
diff --git a/BcoQA/condor/create_condorlist.pl b/BcoQA/condor/create_condorlist.pl
@@ -21,12 +21,19 @@
 my $curdir = `pwd`;
 chomp $curdir;
 opendir my $mydir, '.' or die "cannot open directory $!";
-my @files = grep{ /tpc/ && /\.list/} readdir($mydir);
+my @tpcfiles = grep{ /tpc/ && /\.list/} readdir($mydir);
 close $mydir;
-foreach my $f (sort @files)
+opendir my $mydir, '.' or die "cannot open directory $!";
+my @inttfiles = grep{ /intt/ && /\.list/} readdir($mydir);
+close $mydir;
+foreach my $f (sort @tpcfiles)
 {
     print "tpc list file: $f\n";
 }
+foreach my $f (sort @inttfiles)
+{
+    print "intt list file: $f\n";
+}
 my $gl1file = sprintf("gl1daq.list");
 if (! -f $gl1file)
 {
@@ -65,7 +72,7 @@
     mkpath $outdir;
 }
 open(F1,">condor.list");
-foreach my $file (sort @files)
+foreach my $file (sort @tpcfiles)
 {
     chomp $file;
     my $lfn = basename($file);
@@ -77,6 +84,18 @@
     my $condorlog = sprintf("/tmp/%scondor-%s.log",$myself,$lfn);
     print F1 "$curdir/run_tpcqa.sh $file $ntupfile $outdir $condorout $condorerr $condorlog $curdir\n";
 }
+foreach my $file (sort @inttfiles)
+{
+    chomp $file;
+    my $lfn = basename($file);
+    $lfn =~ s/\.list//;
+    print "file is $lfn\n";
+    my $ntupfile = sprintf("%s.root",$lfn);
+    my $condorout = sprintf("%s/condor-%s.out",$condorlogpath,$lfn);
+    my $condorerr = sprintf("%s/condor-%s.err",$condorlogpath,$lfn);
+    my $condorlog = sprintf("/tmp/%scondor-%s.log",$myself,$lfn);
+    print F1 "$curdir/run_inttqa.sh $file $ntupfile $outdir $condorout $condorerr $condorlog $curdir\n";
+}
 # now for the gl1
 my $file=$gl1file;
     my $lfn = basename($gl1file);

diff --git a/BcoQA/condor/run_inttqa.sh b/BcoQA/condor/run_inttqa.sh
@@ -22,8 +22,6 @@ anabuild=new
 
 source /cvmfs/sphenix.sdcc.bnl.gov/gcc-12.1.0/opt/sphenix/core/bin/sphenix_setup.sh -n $anabuild
 
-#source /opt/sphenix/core/bin/setup_local.sh $HOME/workarea/sPHENIX/gitrepov5/installv1
-
 if [[ ! -z "$_CONDOR_SCRATCH_DIR" && -d $_CONDOR_SCRATCH_DIR ]]
 then
     cd $_CONDOR_SCRATCH_DIR