diff --git a/.gitignore b/.gitignore
index 0056085..4f74cec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,9 @@ data_proton/
Analyzer_C_ACLiC_dict0713aaa966_dictContent.h
.gitignore
Analyzer_C_ACLiC_dict5411fecd5c_dictUmbrella.h
+gainmatch.C
+gainmatch.h
+MakePlotsQQQ.C
+MakePlotsQQQ.h
+MakePlotsSX3.C
+MakePlotsSX3.h
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 565ab11..8dd812a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -116,7 +116,9 @@
"GainMatchSX3Front1.C": "cpp",
"Calibration.C": "cpp",
"GainMatchQQQ.C": "cpp",
- "UTF-8gainmatch.C": "cpp"
+ "UTF-8gainmatch.C": "cpp",
+ "MakePlotsQQQ.C": "cpp",
+ "MakePlotsSX3.C": "cpp"
},
"github-enterprise.uri": "https://fsunuc.physics.fsu.edu"
}
\ No newline at end of file
diff --git a/HistPlotter.h b/Armory/HistPlotter.h
similarity index 100%
rename from HistPlotter.h
rename to Armory/HistPlotter.h
diff --git a/Armory/LICENSE b/Armory/LICENSE
new file mode 100644
index 0000000..f288702
--- /dev/null
+++ b/Armory/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ 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
+.
diff --git a/Armory/README.md b/Armory/README.md
new file mode 100644
index 0000000..8b1911a
--- /dev/null
+++ b/Armory/README.md
@@ -0,0 +1,6 @@
+# HistPlotter
+ - Header-only class to encapsulate CERN ROOT 1D/2D Histogram plotting and application of TCuts.
+ - Can specify folder hierarchy while setting up fills, currently supports only one level.
+ - Cuts specified using a two-column text file containing cut names, and target .root files. These .root files must contain a TCutG of name "CUTG".
+ - Tested for use in macros, with TSelector design pattern and compiled code.
+ - Idea inspired from MyFill() pattern created by github user gwm17
diff --git a/Calibration.C b/Calibration.C
index 4e28179..c3823a8 100644
--- a/Calibration.C
+++ b/Calibration.C
@@ -1,3 +1,4 @@
+
#define Calibration_cxx
#include
@@ -9,128 +10,29 @@
#include
#include
#include
-#include
-#include
-#include "Armory/ClassSX3.h"
-#include "Armory/ClassPW.h"
-#include "TGraphErrors.h"
+#include "Armory/HistPlotter.h"
+#include "TVector3.h"
#include "Calibration.h"
+TH2F *hQQQFVB;
+HistPlotter *plotter;
int padID = 0;
-SX3 sx3_contr;
-PW pw_contr;
-PW pwinstance;
-TVector3 hitPos;
-// TVector3 anodeIntersection;
-std::map> slopeInterceptMap;
-
-bool HitNonZero;
-bool sx3ecut;
-bool qqqEcut;
-
-TH2F *hSX3FvsB;
-TH2F *hSX3FvsB_g;
-TH2F *hSX3;
-TH1F *hZProj;
-TH2F *hsx3IndexVE;
-TH2F *hsx3IndexVE_gm;
-TH2F *hqqqIndexVE;
-TH2F *hqqqIndexVE_gm;
-TH2F *hsx3Coin;
-TH2F *hqqqCoin;
-TH2F *hqqqPolar;
-TH1F *hsx3E_raw;
-TH1F *hsx3E_calib;
-
TCutG *cut;
-TCutG *cut1;
+std::map, std::vector>> dataPoints;
-// Gain arrays
+bool qqqEcut = false;
-const int MAX_SX3 = 24;
-const int MAX_UP = 4;
-const int MAX_DOWN = 4;
-const int MAX_BK = 4;
+// Gain Arrays
const int MAX_QQQ = 4;
const int MAX_RING = 16;
const int MAX_WEDGE = 16;
-double backGain[MAX_SX3][MAX_BK] = {{0}};
-bool backGainValid[MAX_SX3][MAX_BK] = {{false}};
-double frontGain[MAX_SX3][MAX_BK][MAX_UP][MAX_DOWN] = {{{{0}}}};
-bool frontGainValid[MAX_SX3][MAX_BK][MAX_UP][MAX_DOWN] = {{{{false}}}};
-double uvdslope[MAX_SX3][MAX_BK][MAX_UP][MAX_DOWN] = {{{{0}}}};
-double qqqGain[MAX_QQQ][MAX_BK][MAX_UP] = {{{0}}};
-bool qqqGainValid[MAX_QQQ][MAX_BK][MAX_UP] = {{{false}}};
-TH1F *hSX3Spectra[MAX_SX3][MAX_BK][MAX_UP][MAX_DOWN];
-TH1F *hQQQSpectra[MAX_QQQ][MAX_RING][MAX_WEDGE];
+double qqqGain[MAX_QQQ][MAX_RING][MAX_WEDGE] = {{{0}}};
+bool qqqGainValid[MAX_QQQ][MAX_RING][MAX_WEDGE] = {{{false}}};
void Calibration::Begin(TTree * /*tree*/)
{
- TString option = GetOption();
-
- hSX3FvsB = new TH2F("hSX3FvsB", "SX3 Front vs Back; Front E; Back E", 400, 0, 16000, 400, 0, 16000);
- hSX3FvsB_g = new TH2F("hSX3FvsB_g", "SX3 Front vs Back; Front E; Back E", 400, 0, 16000, 400, 0, 16000);
- hsx3IndexVE = new TH2F("hsx3IndexVE", "SX3 index vs Energy; sx3 index ; Energy", 24 * 12, 0, 24 * 12, 400, 0, 5000);
- hSX3 = new TH2F("hSX3", "SX3 Front v Back; Fronts; Backs", 8, 0, 8, 4, 0, 4);
- hsx3Coin = new TH2F("hsx3Coin", "SX3 Coincident", 24 * 12, 0, 24 * 12, 24 * 12, 0, 24 * 12);
- hsx3IndexVE = new TH2F("hsx3IndexVE", "SX3 index vs Energy; sx3 index ; Energy", 24 * 12, 0, 24 * 12, 400, 0, 5000);
- hsx3IndexVE_gm = new TH2F("hsx3IndexVE_cal", "SX3 index vs Energy (calibrated); SX3 index ; Energy", 24 * 12, 0, 24 * 12, 400, 0, 5000);
- hsx3E_raw = new TH1F("hsx3E_raw", "SX3 Back Energy (raw); Energy (arb); Counts", 4000, 0, 16000);
- hsx3E_calib = new TH1F("hsx3E_calib", "SX3 Back Energy (gm); Energy (kev); Counts", 4000, 0, 16000);
- hqqqIndexVE = new TH2F("hqqqIndexVE", "QQQ index vs Energy; QQQ index ; Energy", 4 * 2 * 16, 0, 4 * 2 * 16, 400, 0, 5000);
- hqqqIndexVE_gm = new TH2F("hqqqIndexVE_cal", "QQQ index vs Energy (calibrated); QQQ index ; Energy", 4 * 2 * 16, 0, 4 * 2 * 16, 400, 0, 5000);
- hsx3Coin = new TH2F("hsx3Coin", "SX3 Coincident", 24 * 12, 0, 24 * 12, 24 * 12, 0, 24 * 12);
- hqqqCoin = new TH2F("hqqqCoin", "QQQ Coincident", 4 * 2 * 16, 0, 4 * 2 * 16, 4 * 2 * 16, 0, 4 * 2 * 16);
-
- hqqqPolar = new TH2F("hqqqPolar", "QQQ Polar ID", 16 * 4, -TMath::Pi(), TMath::Pi(), 16, 10, 50);
-
- sx3_contr.ConstructGeo();
- pw_contr.ConstructGeo();
- // ----------------------- Load Back Gains
- {
- std::string filename = "sx3_GainMatchback.txt";
- std::ifstream infile(filename);
- if (!infile.is_open())
- {
- std::cerr << "Error opening " << filename << "!" << std::endl;
- }
- else
- {
- int id, bk;
- double gain;
- while (infile >> id >> bk >> gain)
- {
- backGain[id][bk] = gain;
- backGainValid[id][bk] = (gain > 0);
- }
- infile.close();
- std::cout << "Loaded back gains from " << filename << std::endl;
- }
- }
-
- // ----------------------- Load Front Gains
- {
- std::string filename = "sx3_GainMatchfront.txt";
- std::ifstream infile(filename);
- if (!infile.is_open())
- {
- std::cerr << "Error opening " << filename << "!" << std::endl;
- }
- else
- {
- int id, bk, u, d;
- double gain;
- while (infile >> id >> bk >> u >> d >> gain)
- {
- frontGain[id][bk][u][d] = gain;
- frontGainValid[id][bk][u][d] = (gain > 0);
- }
- infile.close();
- std::cout << "Loaded front gains from " << filename << std::endl;
- }
- }
-
+ plotter = new HistPlotter("Calib.root", "TFILE");
// ----------------------- Load QQQ Gains
{
std::string filename = "qqq_GainMatch.txt";
@@ -152,22 +54,6 @@ void Calibration::Begin(TTree * /*tree*/)
std::cout << "Loaded QQQ gains from " << filename << std::endl;
}
}
-
- for (int id = 0; id < MAX_SX3; id++)
- {
- for (int bk = 0; bk < MAX_BK; bk++)
- {
- for (int up = 0; up < MAX_UP; up++)
- {
- for (int dn = 0; dn < MAX_DOWN; dn++)
- {
- TString hname = Form("hCal_id%d_bk%d_up%d_dn%d", id, bk, up, dn);
- TString htitle = Form("SX3 id%d bk%d up%d dn%d; Energy (arb); Counts", id, bk, up, dn);
- hSX3Spectra[id][bk][up][dn] = new TH1F(hname, htitle, 4000, 0, 16000);
- }
- }
- }
- }
for (int det = 0; det < MAX_QQQ; det++)
{
for (int ring = 0; ring < MAX_RING; ring++)
@@ -176,210 +62,76 @@ void Calibration::Begin(TTree * /*tree*/)
{
TString hname = Form("hCal_qqq%d_ring%d_wedge%d", det, ring, wedge);
TString htitle = Form("QQQ det%d ring%d wedge%d; Energy (arb); Counts", det, ring, wedge);
- hQQQSpectra[det][ring][wedge] = new TH1F(hname, htitle, 4000, 0, 16000);
+ // hQQQSpectra[det][ring][wedge] = new TH1F(hname, htitle, 4000, 0, 16000);
}
}
}
-
- SX3 sx3_contr;
}
+
Bool_t Calibration::Process(Long64_t entry)
{
- hitPos.Clear();
- HitNonZero = false;
-
- // Load branches
- b_sx3Multi->GetEntry(entry);
- b_sx3ID->GetEntry(entry);
- b_sx3Ch->GetEntry(entry);
- b_sx3E->GetEntry(entry);
- b_sx3T->GetEntry(entry);
b_qqqMulti->GetEntry(entry);
b_qqqID->GetEntry(entry);
b_qqqCh->GetEntry(entry);
b_qqqE->GetEntry(entry);
b_qqqT->GetEntry(entry);
- b_pcMulti->GetEntry(entry);
- b_pcID->GetEntry(entry);
- sx3.CalIndex();
qqq.CalIndex();
- pc.CalIndex();
- // ########################################################### Raw data
- sx3ecut = false;
- std::vector> ID; // first = id, 2nd = index
- for (int i = 0; i < sx3.multi; i++)
- {
- ID.emplace_back(sx3.id[i], i);
- hsx3IndexVE->Fill(sx3.index[i], sx3.e[i]);
-
- if (sx3.e[i] > 100)
- sx3ecut = true;
-
- for (int j = i + 1; j < sx3.multi; j++)
- hsx3Coin->Fill(sx3.index[i], sx3.index[j]);
- }
-
- // --- SX3 safe handling ---
- if (!ID.empty())
- {
- std::sort(ID.begin(), ID.end(), [](auto &a, auto &b)
- { return a.first < b.first; });
-
- std::vector> sx3ID;
- sx3ID.push_back(ID[0]);
- bool found = false;
-
- for (size_t i = 1; i < ID.size(); i++)
- {
- if (ID[i].first == sx3ID.back().first)
- {
- sx3ID.push_back(ID[i]);
- if (sx3ID.size() >= 3)
- found = true;
- }
- else
- {
- if (!found)
- {
- sx3ID.clear();
- sx3ID.push_back(ID[i]);
- }
- }
- }
- if (found)
- {
- int sx3ChUp = -1, sx3ChDn = -1, sx3ChBk = -1;
- float sx3EUp = 0.0f, sx3EDn = 0.0f, sx3EBk = 0.0f;
-
- for (size_t i = 0; i < sx3ID.size(); i++)
- {
- int index = sx3ID[i].second;
-
- if (sx3.ch[index] < 8)
- {
- if ((sx3.ch[index] % 2) == 0) // even -> down
- {
- sx3ChDn = sx3.ch[index];
- sx3EDn = sx3.e[index];
- }
- else // odd -> up
- {
- sx3ChUp = sx3.ch[index];
- sx3EUp = sx3.e[index];
- }
- }
- else
- {
- sx3ChBk = sx3.ch[index];
- sx3EBk = sx3.e[index];
- }
-
- bool haveFrontPair = (sx3ChUp >= 0 || sx3ChDn >= 0);
- bool haveBack = (sx3ChBk >= 0);
- double GM_EUp = 0.0, GM_EDn = 0.0, calibEBack = 0.0;
-
- if (haveBack)
- {
- // --- ALWAYS fill raw ADC for diagnostics
- // (temporarily use the existing spectrum to confirm fills)
- // If you don't want raw values mixed with calibrated later, create a separate _raw array.
- hSX3Spectra[sx3ID[i].first][sx3ChBk][sx3ChUp][sx3ChDn]->Fill(sx3EUp);
-
- // --- If gain is available, also fill calibrated energy
- if (frontGainValid[sx3ID[i].first][sx3ChBk][sx3ChUp][sx3ChDn])
- {
- GM_EUp = frontGain[sx3ID[i].first][sx3ChBk][sx3ChUp][sx3ChDn] * sx3EUp;
- if (GM_EUp > 50.0)
- hSX3Spectra[sx3ID[i].first][sx3ChBk][sx3ChUp][sx3ChDn]->Fill(GM_EUp); // optional: mixes raw+calib
- }
- // --- If back gain is available, also fill calibrated energy
- hsx3E_raw->Fill(sx3EBk);
-
- if (backGainValid[sx3ID[i].first][sx3ChBk])
- {
- calibEBack = backGain[sx3ID[i].first][sx3ChBk] * sx3EBk;
- if (calibEBack > 50.0)
- hsx3E_calib->Fill(calibEBack); // optional: mixes raw+calib
- }
-
- // Keep the other diagnostic plots
- hsx3IndexVE_gm->Fill(sx3.index[sx3ID[i].second], GM_EUp);
- hSX3->Fill(sx3ChDn + 4, sx3ChBk);
- hSX3->Fill(sx3ChUp, sx3ChBk);
- hSX3FvsB->Fill(sx3EUp + sx3EDn, sx3EBk);
-
- if (GM_EUp > 50.0 && sx3EBk > 50.0)
- {
- sx3_contr.CalSX3Pos(sx3ID[i].first, sx3ChUp, sx3ChDn, sx3ChBk, GM_EUp, sx3EDn);
- hitPos = sx3_contr.GetHitPos();
- HitNonZero = true;
- }
- }
- }
- }
- }
-
- // ======================= QQQ =======================
for (int i = 0; i < qqq.multi; i++)
{
- int det = qqq.id[i];
- if (qqq.e[i] > 100)
- qqqEcut = true;
-
- for (int j = 0; j < qqq.multi; j++)
- {
- if (j == i)
- continue;
- hqqqCoin->Fill(qqq.index[i], qqq.index[j]);
- }
-
for (int j = i + 1; j < qqq.multi; j++)
{
+ if (qqq.e[i] > 100)
+ qqqEcut = true;
if (qqq.id[i] == qqq.id[j])
{
- int chWedge = -1, chRing = -1;
- if (qqq.ch[i] < qqq.ch[j])
+ int chWedge = -1;
+ int chRing = -1;
+ float eWedgeRaw = 0.0;
+ float eWedge = 0.0;
+ float eRingRaw = 0.0;
+ float eRing = 0.0;
+ if (qqq.ch[i] < 16 && qqq.ch[j] >= 16 && qqqGainValid[qqq.id[i]][qqq.ch[i]][qqq.ch[j] - 16])
{
- chRing = qqq.ch[j] - 16;
chWedge = qqq.ch[i];
+ eWedgeRaw = qqq.e[i];
+ eWedge = qqq.e[i] * qqqGain[qqq.id[i]][qqq.ch[i]][qqq.ch[j] - 16];
+ printf("Wedge E: %.2f Gain: %.4f \n", eWedge, qqqGain[qqq.id[i]][qqq.ch[i]][qqq.ch[j] - 16]);
+ chRing = qqq.ch[j] - 16;
+ eRingRaw = qqq.e[j];
+ eRing = qqq.e[j]; //*qqqGain[qqq.id[j]][qqq.ch[j]][qqq.ch[i]-16];
+ }
+ else if (qqq.ch[j] < 16 && qqq.ch[i] >= 16 && qqqGainValid[qqq.id[j]][qqq.ch[j]][qqq.ch[i] - 16])
+ {
+ chWedge = qqq.ch[j];
+ eWedge = qqq.e[j] * qqqGain[qqq.id[j]][qqq.ch[j]][qqq.ch[i] - 16];
+ eWedgeRaw = qqq.e[j];
+
+ chRing = qqq.ch[i] - 16;
+ eRing = qqq.e[i] * qqqGain[qqq.id[i]][qqq.ch[i]][qqq.ch[j] - 16];
+ eRingRaw = qqq.e[i];
}
else
+ continue;
+
+ // hQQQFVB->Fill(eWedge, eRing);
+ // plotter->Fill2D(Form("hRaw_qqq%d_ring%d_wedge%d", qqq.id[i], chRing, chWedge),400,0,16000,400,0,16000, eWedgeRaw, eRingRaw,"ERaw");
+ plotter->Fill2D("hRawQQQ", 4000, 0, 16000, 4000, 0, 16000, eWedgeRaw, eRingRaw);
+ plotter->Fill2D("hGMQQQ", 4000, 0, 16000, 4000, 0, 16000, eWedge, eRing);
+
+ TString histName = Form("hQQQFVB_id%d_r%d_w%d", qqq.id[i], chRing, chWedge);
+ TH2F *hist2d = (TH2F *)gDirectory->Get(histName);
+ if (!hist2d)
{
- chRing = qqq.ch[i];
- chWedge = qqq.ch[j] - 16;
+ hist2d = new TH2F(histName, Form("QQQ Det%d R%d W%d;Wedge E;Ring E", qqq.id[i], chRing, chWedge), 400, 0, 16000, 400, 0, 16000);
}
- double Ecal = qqq.e[i];
- if (det >= 0 && det < MAX_QQQ &&
- chRing >= 0 && chRing < MAX_RING &&
- chWedge >= 0 && chWedge < MAX_WEDGE)
+ hist2d->Fill(eWedge, eRing);
+ if (cut && cut->IsInside(eWedge, eRing))
{
- // ALWAYS fill raw energy for diagnostics
- hQQQSpectra[det][chRing][chWedge]->Fill(qqq.e[i]);
-
- // If calibrated gain is present, also fill calibrated energy
- if (qqqGainValid[det][chRing][chWedge])
- {
- double Ecal = qqq.e[i] * qqqGain[det][chRing][chWedge];
- hQQQSpectra[det][chRing][chWedge]->Fill(Ecal); // optional: mixes raw+calib
- }
- }
-
- hqqqIndexVE_gm->Fill(qqq.index[i], Ecal);
- hqqqIndexVE->Fill(qqq.index[i], qqq.e[i]);
-
- double theta = -TMath::Pi() / 2 + 2 * TMath::Pi() / 16 / 4. * (qqq.id[i] * 16 + chWedge + 0.5);
- double rho = 50. + 40. / 16. * (chRing + 0.5);
- hqqqPolar->Fill(theta, rho);
-
- if (!HitNonZero)
- {
- double x = rho * TMath::Cos(theta);
- double y = rho * TMath::Sin(theta);
- hitPos.SetXYZ(x, y, 23 + 75 + 30);
- HitNonZero = true;
+ // Accumulate data for gain matching
+ dataPoints[{qqq.id[i], chRing, chWedge}].emplace_back(eWedge, eRing);
}
}
}
@@ -387,77 +139,83 @@ Bool_t Calibration::Process(Long64_t entry)
return kTRUE;
}
+
void Calibration::Terminate()
{
- const double AM241_ALPHA = 5486.0; // keV
+ const int MAX_DET = 4;
+ const int MAX_RING = 16;
+ const int MAX_WEDGE = 16;
- // ----------------------- Summary Plots
- TH2F *hSX3Summary = new TH2F("hSX3Summary", "SX3 Channel Means;Channel Index;Mean (ADC)",
- MAX_SX3 * MAX_BK * MAX_UP * MAX_DOWN, 0, MAX_SX3 * MAX_BK * MAX_UP * MAX_DOWN,
- 200, 0, 10000);
+ const double AM241_PEAK = 5485.56; // keV
+ double calibArray[MAX_DET][MAX_RING][MAX_WEDGE] = {{{0}}};
+ bool calibValid[MAX_DET][MAX_RING][MAX_WEDGE] = {{{false}}};
- TH2F *hQQQSummary = new TH2F("hQQQSummary", "QQQ Channel Means;Channel Index;Mean (ADC)",
- MAX_QQQ * MAX_RING * MAX_WEDGE, 0, MAX_QQQ * MAX_RING * MAX_WEDGE,
- 200, 0, 10000);
-
- // ----------------------- SX3 Calibration (quick check with mean)
- for (int id = 0; id < MAX_SX3; id++)
+ std::ofstream outFile("qqq_Calib.txt");
+ if (!outFile.is_open())
{
- for (int bk = 0; bk < MAX_BK; bk++)
+ std::cerr << "Error opening output file!" << std::endl;
+ return;
+ }
+
+ for (const auto &kv : dataPoints)
+ {
+ auto [id, ring, wedge] = kv.first;
+ const auto &pts = kv.second;
+ if (pts.size() < 5)
+ continue;
+
+ std::vector wE, rE;
+ for (const auto &pr : pts)
{
- for (int up = 0; up < MAX_UP; up++)
+ wE.push_back(pr.first);
+ rE.push_back(pr.second);
+ }
+
+ TGraph g(wE.size(), wE.data(), rE.data());
+ TF1 f("f", "[0]*x", 0, 16000);
+ g.Fit(&f, "QNR");
+ calibArray[id][ring][wedge] = f.GetParameter(0);
+ calibValid[id][ring][wedge] = true;
+ }
+
+ for (int id = 0; id < MAX_DET; ++id)
+ {
+ for (int ring = 0; ring < MAX_RING; ++ring)
+ {
+ for (int wedge = 0; wedge < MAX_WEDGE; ++wedge)
{
- for (int dn = 0; dn < MAX_DOWN; dn++)
+ if (calibValid[id][ring][wedge])
{
- TH1F *hSpec = hSX3Spectra[id][bk][up][dn];
- if (!hSpec || hSpec->GetEntries() < 200)
- continue;
-
- double mean = hSpec->GetMean();
-
- int sx3Index = (((id * MAX_BK + bk) * MAX_UP + up) * MAX_DOWN + dn);
- hSX3Summary->Fill(sx3Index, mean);
-
- std::cout << Form("SX3 id%d bk%d up%d dn%d → mean %.1f",
- id, bk, up, dn, mean)
- << std::endl;
+ outFile << id << " " << wedge << " " << ring << " " << calibArray[id][ring][wedge] << std::endl;
+ printf("Gain match Det%d Ring%d Wedge%d → %.4f \n", id, ring, wedge, calibArray[id][ring][wedge]);
}
}
}
}
- // ----------------------- QQQ Calibration (quick check with mean)
- for (int det = 0; det < MAX_QQQ; det++)
+ outFile.close();
+ std::cout << "Gain matching complete." << std::endl;
+
+ // === Plot all gain-matched QQQ points together with a 2D histogram ===
+ TH2F *hAll = new TH2F("hAll", "All QQQ Gain-Matched;Corrected Wedge E;Ring E",
+ 800, 0, 16000, 800, 0, 16000);
+
+ // Fill the combined TH2F with corrected data
+ for (auto &kv : dataPoints)
{
- for (int ring = 0; ring < MAX_RING; ring++)
+ int id, ring, wedge;
+ std::tie(id, ring, wedge) = kv.first;
+ if (!calibValid[id][ring][wedge])
+ continue;
+ auto &pts = kv.second;
+ for (auto &pr : pts)
{
- for (int wedge = 0; wedge < MAX_WEDGE; wedge++)
- {
- TH1F *hSpec = hQQQSpectra[det][ring][wedge];
- if (!hSpec || hSpec->GetEntries() < 200)
- continue;
-
- double mean = hSpec->GetMean();
-
- int qqqIndex = ((det * MAX_RING + ring) * MAX_WEDGE + wedge);
- hQQQSummary->Fill(qqqIndex, mean);
-
- std::cout << Form("QQQ det%d ring%d wedge%d → mean %.1f",
- det, ring, wedge, mean)
- << std::endl;
- }
+ double corrWedge = pr.first * calibArray[id][ring][wedge];
+ double corrRing = pr.second * calibArray[id][ring][wedge];
+ printf("here: WedgeE: %.2f RingE: %.2f \n", corrWedge, corrRing);
+ hAll->Fill(corrWedge, corrRing);
+ plotter->Fill2D("hAll", 800, 0, 16000, 800, 0, 16000, corrWedge, corrRing); // Create the histogram in the plotter
}
}
-
- // ----------------------- Draw Summary
- TCanvas *cSum = new TCanvas("cSum", "Calibration Summary (Means)", 1200, 600);
- cSum->Divide(2, 1);
-
- cSum->cd(1);
- hSX3Summary->Draw("COLZ");
-
- cSum->cd(2);
- hQQQSummary->Draw("COLZ");
-
- cSum->Update();
+ plotter->FlushToDisk();
}
diff --git a/GainMatchQQQ.C b/GainMatchQQQ.C
index c640fe1..641636d 100644
--- a/GainMatchQQQ.C
+++ b/GainMatchQQQ.C
@@ -25,7 +25,7 @@ void GainMatchQQQ::Begin(TTree * /*tree*/)
{
TString option = GetOption();
- hQQQFVB = new TH2F("hQQQFVB", "QQQ Front vs Back; Front E; Back E", 400, 0, 16000, 400, 0, 16000);
+ hQQQFVB = new TH2F("hQQQFVB", "QQQ Front vs Back; Front E; Back E", 800, 0, 16000, 800, 0, 16000);
// Load the TCutG object
@@ -160,7 +160,7 @@ void GainMatchQQQ::Terminate()
// === Plot all gain-matched QQQ points together with a 2D histogram ===
TH2F *hAll = new TH2F("hAll", "All QQQ Gain-Matched;Corrected Wedge E;Ring E",
- 400, 0, 16000, 400, 0, 16000);
+ 800, 0, 16000, 800, 0, 16000);
// Fill the combined TH2F with corrected data
for (auto &kv : dataPoints)
diff --git a/GainMatchSX3.C b/GainMatchSX3.C
index 3e40eec..dd385af 100644
--- a/GainMatchSX3.C
+++ b/GainMatchSX3.C
@@ -39,13 +39,12 @@ const int MAX_BK = 4;
double frontGainUp[MAX_DET][MAX_BK][MAX_UP][MAX_DOWN] = {{{{0}}}};
double frontGainDown[MAX_DET][MAX_BK][MAX_UP][MAX_DOWN] = {{{{0}}}};
bool frontGainValid[MAX_DET][MAX_BK][MAX_UP][MAX_DOWN] = {{{{false}}}};
-TCanvas c("canvas","canvas", 800, 600);
-
+TCanvas c("canvas", "canvas", 800, 600);
// ==== Configuration Flags ====
const bool interactiveMode = true; // If true: show canvas + wait for user
const bool verboseFit = true; // If true: print fit summary and chi²
-const bool drawCanvases = true; // If false: canvases won't be drawn at all
+const bool drawCanvases = true; // If false: canvases won't be drawn at all
// HistPlotter plotter("SX3GainMatchBack.root");
@@ -91,8 +90,8 @@ void GainMatchSX3::Begin(TTree * /*tree*/)
// plotter.ReadCuts("cuts.txt");
- std::string filename = "sx3_GainMatchfront0.txt";
- //std::string filename = "sx3_GainMatchfront.txt";
+ std::string filename = "sx3_GainMatchfront.txt";
+ // std::string filename = "sx3_GainMatchfront.txt";
std::ifstream infile(filename);
if (!infile.is_open())
@@ -102,12 +101,19 @@ void GainMatchSX3::Begin(TTree * /*tree*/)
}
int id, bk, u, d;
- double gainup,gaindown;
+ double gainup, gaindown;
while (infile >> id >> bk >> u >> d >> gainup >> gaindown)
{
frontGainUp[id][bk][u][d] = gainup;
frontGainDown[id][bk][u][d] = gaindown;
frontGainValid[id][bk][u][d] = true;
+ if(frontGainValid[id][bk][u][d]) {
+ // std::cout << "Loaded front gain for Det" << id << " Bk" << bk << " U" << u << " D" << d
+ // << ": Up=" << gainup << ", Down=" << gaindown << std::endl;
+ }
+ else {
+ std::cout << "No valid front gain for Det" << id << " Bk" << bk << " U" << u << " D" << d << std::endl;
+ }
}
}
@@ -195,10 +201,10 @@ Bool_t GainMatchSX3::Process(Long64_t entry)
if (sx3.ch[index] < 8)
{
if (sx3.ch[index] % 2 == 0)
- {
+ {
sx3ChDn = sx3.ch[index];
sx3EDn = sx3.e[index];
- //
+ //
}
else
{
@@ -212,8 +218,7 @@ Bool_t GainMatchSX3::Process(Long64_t entry)
sx3EBk = sx3.e[index];
}
}
- sx3EUp*=frontGainUp[sx3ID[i].first][sx3ChBk][sx3ChUp / 2][sx3ChDn / 2];
- sx3EDn*=frontGainDown[sx3ID[i].first][sx3ChBk][sx3ChUp / 2][sx3ChDn / 2];
+
}
// Only if we found all three channels do we proceed
if (sx3ChUp >= 0 && sx3ChDn >= 0 && sx3ChBk >= 0)
@@ -222,6 +227,17 @@ Bool_t GainMatchSX3::Process(Long64_t entry)
hSX3->Fill(sx3ChDn + 4, sx3ChBk);
hSX3->Fill(sx3ChUp, sx3ChBk);
hSX3FvsB->Fill(sx3EUp + sx3EDn, sx3EBk);
+
+ if (frontGainValid[sx3ID[0].first][sx3ChBk][sx3ChUp / 2][sx3ChDn / 2])
+ {
+ sx3EUp *= frontGainUp[sx3ID[0].first][sx3ChBk][sx3ChUp / 2][sx3ChDn / 2];
+ sx3EDn *= frontGainDown[sx3ID[0].first][sx3ChBk][sx3ChUp / 2][sx3ChDn / 2];
+ }
+ else
+ {
+ // printf("No front gain for Det%d Bk%d U%d D%d\n", sx3ID[0].first, sx3ChBk, sx3ChUp / 2, sx3ChDn / 2);
+ sx3EUp = sx3EDn = 0.;
+ }
// plotter.Fill2D("hSX3F", 400, 0, 16000, 400, 0, 16000, sx3EUp + sx3EDn, sx3EBk);
// Pick detector ID from one of the correlated hits (all same detector)
@@ -254,7 +270,6 @@ Bool_t GainMatchSX3::Process(Long64_t entry)
hist2d->Fill(sx3EUp + sx3EDn, sx3EBk);
hist2d1->Fill((sx3EUp - sx3EDn) / (sx3EUp + sx3EDn), sx3EBk);
-
}
}
}
@@ -268,7 +283,7 @@ void GainMatchSX3::Terminate()
double backSlope[MAX_DET][MAX_BK] = {{0}};
bool backSlopeValid[MAX_DET][MAX_BK] = {{false}};
- std::ofstream outFile("sx3_BackGains1.txt");
+ std::ofstream outFile("sx3_BackGains0.txt");
if (!outFile.is_open())
{
std::cerr << "Error opening sx3_BackGains.txt for writing!" << std::endl;
@@ -377,7 +392,6 @@ void GainMatchSX3::Terminate()
TH2F *hAsymUnorm = new TH2F("hAsymUnorm", "Up vs Dn;Up E;Dn E",
800, 0.0, 4000.0, 800, 0.0, 4000.0);
-
// Fill histograms using corrected back energies
for (const auto &kv : dataPoints)
{
diff --git a/sx3_GainMatchfront.txt b/sx3_GainMatchfront.txt
index 4f5669b..a2fd28e 100644
--- a/sx3_GainMatchfront.txt
+++ b/sx3_GainMatchfront.txt
@@ -1,8 +1,8 @@
-3 0 1 1 -0.852399 0.881228
-3 0 2 2 -0.813845 0.975967
-3 0 3 3 -0.859643 0.863715
-3 1 1 1 -0.76728 0.942438
-3 1 2 2 -0.780302 0.929008
-3 2 2 2 -0.729082 1.02005
-3 3 2 2 -0.759098 1.05376
-3 3 3 3 -0.821183 0.952335
+3 0 1 1 0.852399 0.881228
+3 0 2 2 0.813845 0.975967
+3 0 3 3 0.859643 0.863715
+3 1 1 1 0.76728 0.942438
+3 1 2 2 0.780302 0.929008
+3 2 2 2 0.729082 1.02005
+3 3 2 2 0.759098 1.05376
+3 3 3 3 0.821183 0.952335