diff --git a/LICENSE b/LICENSE index f288702d..3e70d7a3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,3 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +All rights reserved. - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +The UHH HH -> bbtatau developers. diff --git a/hbt/columnflow_patches.py b/hbt/columnflow_patches.py index 2843efee..be48971a 100644 --- a/hbt/columnflow_patches.py +++ b/hbt/columnflow_patches.py @@ -5,6 +5,7 @@ """ import os +import getpass import law from columnflow.util import memoize @@ -38,6 +39,23 @@ def patch_bundle_repo_exclude_files(): logger.debug(f"patched exclude_files of {BundleRepo.task_family}") +@memoize +def patch_htcondor_workflow_naf_resources(): + """ + Patches the HTCondorWorkflow task to declare user-specific resources when running on the NAF. + """ + from columnflow.tasks.framework.remote import HTCondorWorkflow + + def htcondor_job_resources(self, job_num, branches): + # one "naf_" resource per job, indendent of the number of branches in the job + return {f"naf_{getpass.getuser()}": 1} + + HTCondorWorkflow.htcondor_job_resources = htcondor_job_resources + + logger.debug(f"patched htcondor_job_resources of {HTCondorWorkflow.task_family}") + + @memoize def patch_all(): patch_bundle_repo_exclude_files() + patch_htcondor_workflow_naf_resources diff --git a/hbt/config/analysis_hbt.py b/hbt/config/analysis_hbt.py index 32e93080..d5101049 100644 --- a/hbt/config/analysis_hbt.py +++ b/hbt/config/analysis_hbt.py @@ -17,6 +17,7 @@ ) # analysis-global versions +# (empty since we use the lookup from the law.cfg instead) analysis_hbt.x.versions = {} # files of bash sandboxes that might be required by remote tasks @@ -42,45 +43,45 @@ # load configs # -# 2017 -from hbt.config.configs_run2ul import add_config as add_config_run2ul -from cmsdb.campaigns.run2_2017_nano_v9 import campaign_run2_2017_nano_v9 -from cmsdb.campaigns.run2_2017_nano_uhh_v11 import campaign_run2_2017_nano_uhh_v11 - - -# default v9 config -add_config_run2ul( - analysis_hbt, - campaign_run2_2017_nano_v9.copy(), - config_name=campaign_run2_2017_nano_v9.name, - config_id=2, -) - -# v9 config with limited number of files for faster prototyping -add_config_run2ul( - analysis_hbt, - campaign_run2_2017_nano_v9.copy(), - config_name=f"{campaign_run2_2017_nano_v9.name}_limited", - config_id=12, - limit_dataset_files=2, -) - -# default v11 uhh config -add_config_run2ul( - analysis_hbt, - campaign_run2_2017_nano_uhh_v11.copy(), - config_name=campaign_run2_2017_nano_uhh_v11.name, - config_id=31, -) - -# v11 uhh config with limited number of files for faster prototyping -add_config_run2ul( - analysis_hbt, - campaign_run2_2017_nano_uhh_v11.copy(), - config_name=f"{campaign_run2_2017_nano_uhh_v11.name}_limited", - config_id=32, - limit_dataset_files=2, -) +# # 2017 +# from hbt.config.configs_run2ul import add_config as add_config_run2ul +# from cmsdb.campaigns.run2_2017_nano_v9 import campaign_run2_2017_nano_v9 +# from cmsdb.campaigns.run2_2017_nano_uhh_v11 import campaign_run2_2017_nano_uhh_v11 + + +# # default v9 config +# add_config_run2ul( +# analysis_hbt, +# campaign_run2_2017_nano_v9.copy(), +# config_name=campaign_run2_2017_nano_v9.name, +# config_id=2, +# ) + +# # v9 config with limited number of files for faster prototyping +# add_config_run2ul( +# analysis_hbt, +# campaign_run2_2017_nano_v9.copy(), +# config_name=f"{campaign_run2_2017_nano_v9.name}_limited", +# config_id=12, +# limit_dataset_files=2, +# ) + +# # default v11 uhh config +# add_config_run2ul( +# analysis_hbt, +# campaign_run2_2017_nano_uhh_v11.copy(), +# config_name=campaign_run2_2017_nano_uhh_v11.name, +# config_id=31, +# ) + +# # v11 uhh config with limited number of files for faster prototyping +# add_config_run2ul( +# analysis_hbt, +# campaign_run2_2017_nano_uhh_v11.copy(), +# config_name=f"{campaign_run2_2017_nano_uhh_v11.name}_limited", +# config_id=32, +# limit_dataset_files=2, +# ) # diff --git a/hbt/config/configs_run2ul.py b/hbt/config/configs_run2ul.py index c8f0b440..1903c153 100644 --- a/hbt/config/configs_run2ul.py +++ b/hbt/config/configs_run2ul.py @@ -544,13 +544,13 @@ def add_config( cfg.add_shift(name="mu_down", id=101, type="shape") add_shift_aliases(cfg, "mu", {"muon_weight": "muon_weight_{direction}"}) - btag_uncs = [ + cfg.x.btag_unc_names = [ "hf", "lf", f"hfstats1_{year}", f"hfstats2_{year}", f"lfstats1_{year}", f"lfstats2_{year}", "cferr1", "cferr2", ] - for i, unc in enumerate(btag_uncs): + for i, unc in enumerate(cfg.x.btag_unc_names): cfg.add_shift(name=f"btag_{unc}_up", id=110 + 2 * i, type="shape") cfg.add_shift(name=f"btag_{unc}_down", id=111 + 2 * i, type="shape") add_shift_aliases( @@ -715,7 +715,7 @@ def add_config( "pdf_weight": get_shifts("pdf"), "murmuf_weight": get_shifts("murmuf"), "normalized_pu_weight": get_shifts("minbias_xs"), - "normalized_njet_btag_weight": get_shifts(*(f"btag_{unc}" for unc in btag_uncs)), + "normalized_njet_btag_weight": get_shifts(*(f"btag_{unc}" for unc in cfg.x.btag_unc_names)), "electron_weight": get_shifts("e"), "muon_weight": get_shifts("mu"), "tau_weight": get_shifts(*(f"tau_{unc}" for unc in tau_uncs)), diff --git a/hbt/config/configs_run3.py b/hbt/config/configs_run3.py index 23d33a08..9938e0a4 100644 --- a/hbt/config/configs_run3.py +++ b/hbt/config/configs_run3.py @@ -34,7 +34,10 @@ def add_config( limit_dataset_files: int | None = None, ) -> od.Config: # some validations + assert campaign.x.run == 3 assert campaign.x.year in [2022, 2023, 2024] + if campaign.x.year == 2022: + assert campaign.x.postfix in ["pre", "post"] if campaign.x.year == 2024: raise NotImplementedError("It a bit too early for 2024 analysis :)") @@ -55,6 +58,20 @@ def add_config( if not year_postfix: cfg.add_tag("pre") + # helper to enable processes / datasets only for a specific era + def if_era( + run: int | list[int], + year: int | list[int], + postfix: str | list[str], + values: list[str], + ) -> list[str]: + match = ( + campaign.x.run == run and + campaign.x.year == year and + campaign.x("postfix", "") == postfix + ) + return values if match else [] + # add processes we are interested in process_names = [ "data", @@ -69,7 +86,7 @@ def add_config( # "vvv", # "qcd", # "h", - "hh_ggf_bbtautau", + "hh_ggf_hbb_htt", # "hh_vbf_bbtautau", # "graviton_hh_ggf_bbtautau_m400", # "graviton_hh_ggf_bbtautau_m1250", @@ -88,29 +105,16 @@ def add_config( # add datasets we need to study dataset_names = [ - # data - # "data_e_b", - # "data_e_c", - # "data_e_d", - # "data_e_e", - # "data_e_f", - # "data_mu_a", - # "data_mu_b", - # "data_mu_c", - # "data_mu_d", - # "data_mu_e", - # "data_mu_f", - # "data_mu_g", - # "data_tau_b", - # "data_tau_c", - "data_tau_d", - # "data_tau_e", - # "data_tau_f", - # "data_tau_g", + # signals + "hh_ggf_hbb_htt_kl1_kt1_c20_powheg", + "hh_ggf_hbb_htt_kl0_kt1_c20_powheg", + "hh_ggf_hbb_htt_kl2p45_kt1_c20_powheg", + "hh_ggf_hbb_htt_kl5_kt1_c20_powheg", # backgrounds "tt_sl_powheg", - # "tt_dl_powheg", - # "tt_fh_powheg", + "tt_dl_powheg", + "tt_fh_powheg", + # TODO: add more # "ttz_llnunu_amcatnlo", # "ttw_nlu_amcatnlo", # "ttw_qq_amcatnlo", @@ -149,8 +153,10 @@ def add_config( # "tth_tautau_powheg", # "tth_bb_powheg", # "tth_nonbb_powheg", - # # signals - "hh_ggf_hbb_htt_kl1_kt1_c20_powheg", + # data + *if_era(run=3, year=2022, postfix="pre", values=[ + f"data_{stream}_{period}" for stream in ["mu", "e", "tau", "met"] for period in "cd" + ]), ] for dataset_name in dataset_names: # development switch in case datasets are not _yet_ there @@ -182,7 +188,7 @@ def add_config( cfg.x.default_inference_model = "test_no_shifts" cfg.x.default_categories = ("incl",) cfg.x.default_variables = ("n_jet", "n_btag") - cfg.x.default_weight_producer = "all_weights" + cfg.x.default_weight_producer = "default" # process groups for conveniently looping over certain processs # (used in wrapper_factory and during plotting) @@ -218,12 +224,12 @@ def add_config( # TODO later: preliminary luminosity using norm tag. Must be corrected, when more data is available # https://twiki.cern.ch/twiki/bin/view/CMS/PdmVRun3Analysis if year == 2022: - if campaign.x.postfix == "post": - cfg.x.luminosity = Number(26671.7, { + if campaign.x.postfix == "pre": + cfg.x.luminosity = Number(7980.4, { "total": 0.014j, }) - else: - cfg.x.luminosity = Number(7980.4, { + else: # post + cfg.x.luminosity = Number(26671.7, { "total": 0.014j, }) elif year == 2023: @@ -520,12 +526,12 @@ def add_config( ) # start at id=50 - tau_uncs = [ + cfg.x.tau_unc_names = [ "jet_dm0", "jet_dm1", "jet_dm10", "e_barrel", "e_endcap", "mu_0p0To0p4", "mu_0p4To0p8", "mu_0p8To1p2", "mu_1p2To1p7", "mu_1p7To2p3", ] - for i, unc in enumerate(tau_uncs): + for i, unc in enumerate(cfg.x.tau_unc_names): cfg.add_shift(name=f"tau_{unc}_up", id=50 + 2 * i, type="shape") cfg.add_shift(name=f"tau_{unc}_down", id=51 + 2 * i, type="shape") add_shift_aliases(cfg, f"tau_{unc}", {"tau_weight": f"tau_weight_{unc}_" + "{direction}"}) @@ -552,13 +558,13 @@ def add_config( cfg.add_shift(name="mu_down", id=101, type="shape") add_shift_aliases(cfg, "mu", {"muon_weight": "muon_weight_{direction}"}) - btag_uncs = [ + cfg.x.btag_unc_names = [ "hf", "lf", f"hfstats1_{year}", f"hfstats2_{year}", f"lfstats1_{year}", f"lfstats2_{year}", "cferr1", "cferr2", ] - for i, unc in enumerate(btag_uncs): + for i, unc in enumerate(cfg.x.btag_unc_names): cfg.add_shift(name=f"btag_{unc}_up", id=110 + 2 * i, type="shape") cfg.add_shift(name=f"btag_{unc}_down", id=111 + 2 * i, type="shape") add_shift_aliases( @@ -693,17 +699,19 @@ def add_config( }, }) - # event weight columns as keys in an OrderedDict, mapped to shift instances they depend on + # configurations for all possible event weight columns as keys in an OrderedDict, + # mapped to shift instances they depend on + # (this info is used by weight producers) get_shifts = functools.partial(get_shifts_from_sources, cfg) cfg.x.event_weights = DotDict({ "normalization_weight": [], "pdf_weight": get_shifts("pdf"), "murmuf_weight": get_shifts("murmuf"), "normalized_pu_weight": get_shifts("minbias_xs"), - "normalized_njet_btag_weight": get_shifts(*(f"btag_{unc}" for unc in btag_uncs)), + "normalized_njet_btag_weight": get_shifts(*(f"btag_{unc}" for unc in cfg.x.btag_unc_names)), "electron_weight": get_shifts("e"), "muon_weight": get_shifts("mu"), - "tau_weight": get_shifts(*(f"tau_{unc}" for unc in tau_uncs)), + "tau_weight": get_shifts(*(f"tau_{unc}" for unc in cfg.x.tau_unc_names)), "tau_trigger_weight": get_shifts("etau_trigger", "mutau_trigger", "tautau_trigger"), }) @@ -712,22 +720,9 @@ def add_config( if dataset.x("is_ttbar", False): dataset.x.event_weights = {"top_pt_weight": get_shifts("top_pt")} - # versions per task family and optionally also dataset and shift - # None can be used as a key to define a default value - # TODO: versioning is disabled for now and will be enabled once needed + # pinned versions + # (empty since we use the lookup from the law.cfg instead) cfg.x.versions = {} - # if cfg.name == "run2_2017_nano_v9": - # cfg.x.versions = { - # "cf.CalibrateEvents": "dev1", - # "cf.MergeSelectionStats": "dev1", - # "cf.MergeSelectionMasks": "dev1", - # "cf.SelectEvents": "dev1", - # "cf.ReduceEvents": "dev1", - # "cf.MergeReductionStats": "dev1", - # "cf.MergeReducedEvents": "dev1", - # } - # else: - # raise NotImplementedError(f"config versions not implemented for {cfg.name}") # channels cfg.add_channel(name="mutau", id=1) diff --git a/hbt/tasks/__init__.py b/hbt/tasks/__init__.py index 8c4d9a96..381a505b 100644 --- a/hbt/tasks/__init__.py +++ b/hbt/tasks/__init__.py @@ -3,4 +3,5 @@ # provisioning imports import hbt.tasks.base +import hbt.tasks.stats import hbt.tasks.studies diff --git a/hbt/tasks/parameters.py b/hbt/tasks/parameters.py new file mode 100644 index 00000000..8acb6918 --- /dev/null +++ b/hbt/tasks/parameters.py @@ -0,0 +1,17 @@ +# coding: utf-8 + +""" +Custom, common parameters. +""" + +import luigi + + +table_format_param = luigi.Parameter( + default="fancy_grid", + description="a tabulate table format; default: 'fancy_grid'", +) +escape_markdown_param = luigi.BoolParameter( + default=False, + description="escape some characters for markdown; default: False", +) diff --git a/hbt/tasks/stats.py b/hbt/tasks/stats.py new file mode 100644 index 00000000..c5aa96fa --- /dev/null +++ b/hbt/tasks/stats.py @@ -0,0 +1,80 @@ +# coding: utf-8 + +""" +Tasks to print various statistics. +""" + +import functools + +import law + +from columnflow.tasks.framework.base import ConfigTask +from columnflow.util import dev_sandbox + +from hbt.tasks.base import HBTTask +from hbt.tasks.parameters import table_format_param + + +class ListDatasetStats(HBTTask, ConfigTask, law.tasks.RunOnceTask): + + table_format = table_format_param + + # no version required + version = None + + sandbox = dev_sandbox(law.config.get("analysis", "default_columnar_sandbox")) + + def run(self): + import tabulate + tabulate.PRESERVE_WHITESPACE = True + + # color helpers + green = functools.partial(law.util.colored, color="green") + red = functools.partial(law.util.colored, color="red") + red_bright = functools.partial(law.util.colored, color="red", style="bright") + cyan = functools.partial(law.util.colored, color="cyan") + bright = functools.partial(law.util.colored, style="bright") + + # headers + headers = ["Dataset", "Files", "Events"] + + # content + rows = [] + sum_files_nominal, sum_events_nominal = 0, 0 + sum_files_syst, sum_events_syst = 0, 0 + sum_files_data, sum_events_data = 0, 0 + for dataset_inst in self.config_inst.datasets: + col = ( + cyan + if dataset_inst.is_data + else (green if dataset_inst.name.startswith("hh_") else red) + ) + # nominal info + rows.append([col(dataset_inst.name), dataset_inst.n_files, dataset_inst.n_events]) + # increment sums + if dataset_inst.is_data: + sum_files_data += dataset_inst.n_files + sum_events_data += dataset_inst.n_events + else: + sum_files_nominal += dataset_inst.n_files + sum_events_nominal += dataset_inst.n_events + # potential shifts + for shift_name, info in dataset_inst.info.items(): + if shift_name == "nominal" or shift_name not in self.config_inst.shifts: + continue + rows.append([red_bright(f" → {shift_name}"), info.n_files, info.n_events]) + # increment sums + sum_files_syst += info.n_files + sum_events_syst += info.n_events + # sums + rows.append([bright("total MC (nominal)"), sum_files_nominal, sum_events_nominal]) + if sum_files_syst or sum_events_syst: + sum_files = sum_files_nominal + sum_files_syst + sum_events = sum_events_nominal + sum_events_syst + rows.append([bright("total MC (all)"), sum_files, sum_events]) + if sum_files_data or sum_events_data: + rows.append([bright("total data"), sum_files_data, sum_events_data]) + + # print the table + table = tabulate.tabulate(rows, headers=headers, tablefmt=self.table_format, intfmt="_") + self.publish_message(table) diff --git a/hbt/tasks/studies/triggers.py b/hbt/tasks/studies/triggers.py index 7a2a79ba..9f09c7e7 100644 --- a/hbt/tasks/studies/triggers.py +++ b/hbt/tasks/studies/triggers.py @@ -6,7 +6,6 @@ from collections import OrderedDict -import luigi import law from columnflow.tasks.framework.base import Requirements, DatasetTask @@ -15,6 +14,7 @@ from columnflow.util import ensure_proxy, dev_sandbox from hbt.tasks.base import HBTTask +from hbt.tasks.parameters import table_format_param, escape_markdown_param class PrintTriggersInFile(HBTTask, DatasetTask, law.tasks.RunOnceTask): @@ -26,7 +26,7 @@ class PrintTriggersInFile(HBTTask, DatasetTask, law.tasks.RunOnceTask): > law run hbt.PrintTriggersInFile --dataset hh_ggf_bbtautau_madgraph """ - sandbox = dev_sandbox("bash::$CF_BASE/sandboxes/venv_columnar.sh") + sandbox = dev_sandbox(law.config.get("analysis", "default_columnar_sandbox")) version = None @@ -70,16 +70,10 @@ class PrintExistingConfigTriggers(HBTTask, DatasetsProcessesMixin, law.tasks.Run > law run hbt.PrintExistingConfigTriggers --datasets "hh_ggf_bbtautau_madgraph,data_mu_{b,c,d,e,f}" """ - table_format = luigi.Parameter( - default="fancy_grid", - description="a tabulate table format; default: 'fancy_grid'", - ) - escape_markdown = luigi.BoolParameter( - default=False, - description="escape some characters for markdown; default: False", - ) + table_format = table_format_param + escape_markdown = escape_markdown_param - sandbox = dev_sandbox("bash::$CF_BASE/sandboxes/venv_columnar.sh") + sandbox = dev_sandbox(law.config.get("analysis", "default_columnar_sandbox")) version = None processes = None diff --git a/hbt/weight/default.py b/hbt/weight/default.py new file mode 100644 index 00000000..4eeaba3c --- /dev/null +++ b/hbt/weight/default.py @@ -0,0 +1,57 @@ +# coding: utf-8 + +""" +Default event weight definitions. +""" + +from columnflow.weight import WeightProducer, weight_producer +from columnflow.columnar_util import Route +from columnflow.util import maybe_import, pattern_matcher + +ak = maybe_import("awkward") +np = maybe_import("numpy") + + +@weight_producer( + # both produced columns and dependent shifts are defined in init below + # only run on mc + mc_only=True, + # options to keep or drop specific weights + keep_weights=None, + drop_weights=None, +) +def default(self: WeightProducer, events: ak.Array, **kwargs) -> ak.Array: + # build the full event weight + weight = ak.Array(np.ones(len(events), dtype=np.float32)) + for column in self.weight_columns: + weight = weight * Route(column).apply(events) + + return events, weight + + +@default.init +def default_init(self: WeightProducer) -> None: + # use the config's auxiliary event_weights, drop some of them based on drop_weights, and on this + # weight producer instance, store weight_columns, used columns, and shifts + self.weight_columns = [] + + # helpers to match to kept or dropped weights + do_keep = pattern_matcher(self.keep_weights) if self.keep_weights else (lambda _: True) + do_drop = pattern_matcher(self.drop_weights) if self.drop_weights else (lambda _: False) + + for weight_name in self.config_inst.x.event_weights: + if not do_keep(weight_name) or do_drop(weight_name): + continue + + self.weight_columns.append(weight_name) + self.uses.add(weight_name) + self.shifts |= { + shift_inst.name + for shift_inst in self.config_inst.x.event_weights[weight_name] + } + + +normalization_only = default.derive( + "normalization_only", + cls_dict={"keep_weights": "normalization_weight"}, +) diff --git a/law.cfg b/law.cfg index 666197e7..0883aed7 100644 --- a/law.cfg +++ b/law.cfg @@ -30,6 +30,7 @@ production_modules: columnflow.production.{categories,normalization,processes}, calibration_modules: columnflow.calibration.cms.{jets,met}, hbt.calibration.{default,jet,tau} selection_modules: columnflow.selection.cms.{json_filter, met_filters}, hbt.selection.{default,lepton,trigger,jetmet} categorization_modules: hbt.categorization.default +weight_production_modules: columnflow.weight.{empty,all_weights}, hbt.weight.default ml_modules: hbt.ml.test inference_modules: hbt.inference.test @@ -41,7 +42,7 @@ skip_ensure_proxy: False # some remote workflow parameter defaults htcondor_flavor: $CF_HTCONDOR_FLAVOR -htcondor_share_software: False +htcondor_share_software: True slurm_flavor: $CF_SLURM_FLAVOR slurm_partition: $CF_SLURM_PARTITION @@ -75,6 +76,9 @@ lfn_sources: wlcg_fs_desy_store, wlcg_fs_infn_redirector, wlcg_fs_global_redirec # for local targets : "local[, LOCAL_FS_NAME or STORE_PATH]" # for remote targets: "wlcg[, WLCG_FS_NAME]" # (when WLCG_FS_NAME is empty, the tasks' "default_wlcg_fs" attribute is used) +# specific locations +# run3_2022_preEE*__cf.CalibrateEvents: wlcg, wlcg_fs_desy_nprouvos +# fallbacks cf.BundleRepo: wlcg cf.BundleSoftware: wlcg cf.BundleBashSandbox: wlcg @@ -97,6 +101,11 @@ cf.MLEvaluation: wlcg cf.UniteColumns: wlcg +[versions] + +# run3_2022_preEE*__cf.CalibrateEvents: prod1 + + [job] job_file_dir: $CF_JOB_BASE @@ -218,11 +227,11 @@ xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/ base: &::webdav_base -[wlcg_fs_desy_nprouvos] +[wlcg_fs_desy_pkeicher] -webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store -gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store -xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store +webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/pkeicher/hbt_store +gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/pkeicher/hbt_store +xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/pkeicher/hbt_store base: &::webdav_base @@ -232,3 +241,38 @@ webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/st gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/bwieders/hbt_store xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/bwieders/hbt_store base: &::webdav_base + + +[wlcg_fs_desy_nprouvos] + +webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store +gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store +xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/nprouvos/hbt_store +base: &::webdav_base + + +[wlcg_fs_desy_aalvesan] + +webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/aalvesan/hbt_store +gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/aalvesan/hbt_store +xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/aalvesan/hbt_store +base: &::webdav_base + + +[wlcg_fs_desy_anhaddad] + +webdav_base: davs://dcache-cms-webdav-wan.desy.de:2880/pnfs/desy.de/cms/tier2/store/user/anhaddad/hbt_store +gsiftp_base: gsiftp://dcache-door-cms04.desy.de:2811/pnfs/desy.de/cms/tier2/store/user/anhaddad/hbt_store +xrootd_base: root://dcache-cms-xrootd.desy.de:1094/pnfs/desy.de/cms/tier2/store/user/anhaddad/hbt_store +base: &::webdav_base + + +[luigi_resources] + +naf_riegerma: 5000 +naf_pkeicher: 5000 +naf_alvesand: 5000 +naf_wiedersb: 5000 +naf_prouvost: 5000 +naf_haddadan: 5000 +naf_nguyenth: 5000 diff --git a/modules/cmsdb b/modules/cmsdb index 6229d4cc..7f1676d3 160000 --- a/modules/cmsdb +++ b/modules/cmsdb @@ -1 +1 @@ -Subproject commit 6229d4cc2916d7398b27c5edb393bdae5b3b9cf1 +Subproject commit 7f1676d3e89e02f4e1a2aebfd60938ca2e225c10 diff --git a/modules/columnflow b/modules/columnflow index 8fc92be5..c6b7d07b 160000 --- a/modules/columnflow +++ b/modules/columnflow @@ -1 +1 @@ -Subproject commit 8fc92be5ef6c95276857250a754777ac092fa069 +Subproject commit c6b7d07bf3afd49c270ad9cc0e27b9eef3756923 diff --git a/setup.sh b/setup.sh index bbfccda2..62cca430 100644 --- a/setup.sh +++ b/setup.sh @@ -65,6 +65,8 @@ setup_hbt() { export CF_REPO_BASE="${HBT_BASE}" export CF_REPO_BASE_ALIAS="HBT_BASE" export CF_SETUP_NAME="${setup_name}" + export CF_SCHEDULER_HOST="${CF_SCHEDULER_HOST:-naf-cms14.desy.de}" + export CF_SCHEDULER_PORT="${CF_SCHEDULER_PORT:-8088}" # load cf setup helpers CF_SKIP_SETUP="1" source "${CF_BASE}/setup.sh" "" || return "$?"