| 16 |
|
sub datasetExists; |
| 17 |
|
sub uploadConfig; |
| 18 |
|
sub locationExists; |
| 19 |
+ |
sub getLocation; |
| 20 |
|
|
| 21 |
|
our $db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User") or die "Failed to connect to Tier 3, stopped"; |
| 22 |
|
|
| 23 |
|
my %opt; |
| 24 |
|
Getopt::Long::Configure ("bundling"); |
| 25 |
< |
GetOptions (\%opt, "comment|c=s", "format|f=s", "pyConfig|p=s", "crabCfg|b=s", "jsonFile|j=s", "lumiSummary|s=s", "location|l=s", "name|n=s", "fileList|t=s", "release|r=s", "other|o", "recipe|e=s", "globalTag|g=s", "configName|i=s", "xSection|x=s", "help|h"); |
| 25 |
> |
GetOptions (\%opt, "comment|c=s", "format|f=s", "pyConfig|p=s", "crabCfg|b=s", "jsonFile|j=s", "lumiSummary|s=s", "location|l=s", "name|n=s", "fileList|t=s", "release|r=s", "other|o", "recipe|e=s", "globalTag|g=s", "configName|i=s", "xSection|x=s", "higherOrderXSec|y=s", "help|h"); |
| 26 |
|
my $argc = @ARGV; |
| 27 |
|
|
| 28 |
|
printHelp ($ARGV[0]) if $opt{"help"}; |
| 87 |
|
print "This location is already registered in the database!\n"; |
| 88 |
|
exit; |
| 89 |
|
} |
| 90 |
< |
dbUpdate ($id, $fullDataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $opt{"format"}, $opt{"location"}, $opt{"name"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"}, $opt{"globalTag"}, $opt{"configName"}, $opt{"xSection"}) if !$opt{"other"}; |
| 90 |
> |
dbUpdate ($id, $fullDataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $opt{"format"}, $opt{"location"}, $opt{"name"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"}, $opt{"globalTag"}, $opt{"configName"}, $opt{"xSection"}, $opt{"higherOrderXSec"}) if !$opt{"other"}; |
| 91 |
|
dbUpdateOther ($id, $opt{"comment"}, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $opt{"other"}; |
| 92 |
|
dbDelete ($id) if $ARGV[0] eq "deleteEntry" && !$opt{"other"}; |
| 93 |
|
dbDeleteOther ($id) if $ARGV[0] eq "deleteEntry" && $opt{"other"}; |
| 195 |
|
my $globalTag = shift; |
| 196 |
|
my $configName = shift; |
| 197 |
|
my $xSection = shift; |
| 198 |
+ |
my $ySection = shift; |
| 199 |
+ |
|
| 200 |
+ |
$location = getLocation ($id) if $id > 0 |
| 201 |
+ |
&& !$crabCfgName |
| 202 |
+ |
&& !$comment |
| 203 |
+ |
&& !$format |
| 204 |
+ |
&& !$globalTag |
| 205 |
+ |
&& !$configName |
| 206 |
+ |
&& !$jsonFileName |
| 207 |
+ |
&& !$location |
| 208 |
+ |
&& !$name |
| 209 |
+ |
&& !$psetName |
| 210 |
+ |
&& !$release |
| 211 |
+ |
&& !$lumiSummaryName |
| 212 |
+ |
&& !$xSection |
| 213 |
+ |
&& !$ySection; |
| 214 |
|
|
| 215 |
|
my $user = $userAndHost; |
| 216 |
|
$user =~ s/@.*$//g; |
| 283 |
|
$lumiSummary = join ("", @lumiSummary); |
| 284 |
|
} |
| 285 |
|
$release .= ".$configName" if $configName; |
| 286 |
< |
($nFiles, $size) = sizeOfDataset ($dataset, $location, $fileList); |
| 286 |
> |
($nFiles, $size) = sizeOfDataset ($location, $fileList); |
| 287 |
|
my $fullLocation = $location; |
| 288 |
|
$fullLocation = "$ENV{'PWD'}/$location" if !($location =~ m/^\//); |
| 289 |
|
|
| 325 |
|
my $id = 1; |
| 326 |
|
$id = $row[0] + 1 if $results->numrows (); |
| 327 |
|
|
| 328 |
< |
$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version, globalTag, crossSectionInPicobarn) values ($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release', '$globalTag', $xSection)"; |
| 328 |
> |
$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version, globalTag, crossSectionInPicobarn, higherOrderCrossSectionInPicobarn) values ($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release', '$globalTag', $xSection, $ySection)"; |
| 329 |
|
} |
| 330 |
|
if ($id > 0) |
| 331 |
|
{ |
| 339 |
|
$results = $db->query ($query); |
| 340 |
|
if ($results->numrows ()) |
| 341 |
|
{ |
| 342 |
< |
print "This dataset already exists in the database. Create anyway? (y/N): "; |
| 342 |
> |
print "This dataset already exists in the database. Use this name anyway? (y/N): "; |
| 343 |
|
my $response = <STDIN>; |
| 344 |
|
$response =~ s/\n//g; |
| 345 |
|
$response = "n" if !$response; |
| 364 |
|
$values .= ", version='$release'" if $release; |
| 365 |
|
$values .= ", globalTag='$globalTag'" if $globalTag; |
| 366 |
|
$values .= ", crossSectionInPicobarn=$xSection" if $xSection; |
| 367 |
+ |
$values .= ", higherOrderCrossSectionInPicobarn=$ySection" if $ySection; |
| 368 |
|
|
| 369 |
|
$values =~ s/^, //; |
| 370 |
|
$query = "update ntuple set $values where id=$id"; |
| 436 |
|
printf "%-29s%s\n", " -r, --release NAME", "ntuple release used to produce ntuples"; |
| 437 |
|
printf "%-29s%s\n", " -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB"; |
| 438 |
|
printf "%-29s%s\n", " -x, --xSection XSEC", "cross section in picobarns for the sample"; |
| 439 |
+ |
printf "%-29s%s\n", " -y, --higherOrderXSec XSEC", "higher-order cross section in picobarns for the"; |
| 440 |
+ |
printf "%-29s%s\n", " ", "sample"; |
| 441 |
|
} |
| 442 |
|
elsif ($command eq "createOther") |
| 443 |
|
{ |
| 450 |
|
elsif ($command eq "update") |
| 451 |
|
{ |
| 452 |
|
print "Usage: $exeName [OPTION]... update NAME\n"; |
| 453 |
< |
print "Updates an existing database entry for dataset NAME.\n"; |
| 453 |
> |
print "Updates an existing database entry for dataset NAME. If no options are given,\n"; |
| 454 |
> |
print "updates the number of files and the size on disk of the dataset using the\n"; |
| 455 |
> |
print "location in the database.\n"; |
| 456 |
|
print "\n"; |
| 457 |
|
print "Mandatory arguments to long options are mandatory for short options too.\n"; |
| 458 |
|
printf "%-29s%s\n", " -b, --crabCfg FILE", "CRAB config used to submit ntuple jobs"; |
| 468 |
|
printf "%-29s%s\n", " -r, --release NAME", "ntuple release used to produce ntuples"; |
| 469 |
|
printf "%-29s%s\n", " -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB"; |
| 470 |
|
printf "%-29s%s\n", " -x, --xSection XSEC", "cross section in picobarns for the sample"; |
| 471 |
+ |
printf "%-29s%s\n", " -y, --higherOrderXSec XSEC", "higher-order cross section in picobarns for the"; |
| 472 |
+ |
printf "%-29s%s\n", " ", "sample"; |
| 473 |
|
} |
| 474 |
|
elsif ($command eq "finish") |
| 475 |
|
{ |
| 558 |
|
sub |
| 559 |
|
sizeOfDataset |
| 560 |
|
{ |
| 537 |
– |
my $dataset = shift; |
| 561 |
|
my $location = shift; |
| 562 |
|
my $fileList = shift; |
| 563 |
|
|
| 622 |
|
open (RECIPE, "<$recipeName"); |
| 623 |
|
my @recipe = <RECIPE>; |
| 624 |
|
close (RECIPE); |
| 625 |
< |
my $recipe = join ("\n", @recipe); |
| 625 |
> |
my $recipe = join ("", @recipe); |
| 626 |
|
|
| 627 |
|
my $query = "select max(id) from ntupleRelease"; |
| 628 |
|
$db->selectdb ("ntuple"); |
| 791 |
|
|
| 792 |
|
return 0; |
| 793 |
|
} |
| 794 |
+ |
|
| 795 |
+ |
sub |
| 796 |
+ |
getLocation |
| 797 |
+ |
{ |
| 798 |
+ |
my $id = shift; |
| 799 |
+ |
|
| 800 |
+ |
my $query = "select location from ntuple where id=$id"; |
| 801 |
+ |
$db->selectdb ("ntuple"); |
| 802 |
+ |
my $results = $db->query ($query); |
| 803 |
+ |
my @row = $results->fetchrow (); |
| 804 |
+ |
|
| 805 |
+ |
return $row[0]; |
| 806 |
+ |
} |
