Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weā€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

šŸ’„DO NOT MERGEšŸ’„ ā— add new TPC alignment, hit errors and slewing corrections for 2024 #702

Open
wants to merge 52 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
f24b000
Add defalt values
fisyak Jul 29, 2024
b9352bd
Clean up
fisyak Jul 31, 2024
9aae93c
Add switch off color for batch mode
fisyak Aug 7, 2024
d152e4f
Alignment2024
fisyak Aug 7, 2024
24316ac
TpcRS hit errors base on MDF4 parameterization
fisyak Aug 7, 2024
921b24e
new Tpc hit errors
fisyak Aug 7, 2024
1fe7ee9
make them visible in standard library
fisyak Aug 7, 2024
282c28f
back to bfore HFT era
fisyak Aug 7, 2024
5b2ecc5
Clean up
fisyak Aug 7, 2024
2be2cf8
set ideal
fisyak Aug 7, 2024
d04a560
Warn off
fisyak Aug 7, 2024
701026a
new TPc hit error parameterization
fisyak Aug 7, 2024
ae31ad3
new errors and shifts from Alignment2024, supress asserts
fisyak Aug 7, 2024
550ae69
new Tpc Hit errors, supress asserts
fisyak Aug 7, 2024
5c66e08
new errors
fisyak Aug 7, 2024
10bda9e
add color
fisyak Aug 7, 2024
ea24401
Add Alignment2024 and TFG flavor for it
fisyak Aug 7, 2024
8828f60
Add Alignment2024, remove obsolete hitfit from chain options
fisyak Aug 7, 2024
b6046fe
Add default handler for logger
fisyak Aug 7, 2024
12fa9ff
Add ideal parameters
fisyak Aug 7, 2024
8496cf4
reduce no. of committed files
fisyak Aug 8, 2024
1088b8f
Merge branch 'main' into TFG24c.Export.Mini
fisyak Aug 8, 2024
eee260b
Add default
fisyak Aug 11, 2024
85e5ff6
Add dependence StiCA from DbUtil, fix typo
fisyak Aug 11, 2024
470757a
Add protection agaist illegal clusters at pad = 0 or time = 0
fisyak Aug 11, 2024
a3bfe16
Merge branch 'TFG24c.Export.Mini' of github.com:star-bnl/star-sw intoā€¦
fisyak Aug 11, 2024
cfd375d
Add DbUtil for StiCA
fisyak Aug 11, 2024
883bc88
Merge branch 'main' into TFG24c.Export.Mini
fisyak Aug 14, 2024
92933ae
Merge branch 'main' into TFG24c.Export.Mini
fisyak Aug 15, 2024
65ad613
move Bfc.xml
fisyak Aug 15, 2024
df6a290
move Bfc.xml
fisyak Aug 15, 2024
d2d77f6
Merge branch 'TFG24c.Export.Mini' of github.com:star-bnl/star-sw intoā€¦
fisyak Aug 15, 2024
03176b3
Merge branch 'main' into TFG24c.Export.Mini
fisyak Aug 17, 2024
d21c128
Resolve conflicts with PR#709
fisyak Aug 22, 2024
15106c7
comment out ibreak count to catch assert case
fisyak Aug 23, 2024
1d9e062
Merge branch 'main' into TFG24c.Export.Mini
fisyak Aug 24, 2024
2f52e6c
Merge branch 'main' into TFG24c.Export.Mini
fisyak Aug 31, 2024
cac6321
fix bug with padpitch, add const
fisyak Sep 1, 2024
69abeeb
add const
fisyak Sep 1, 2024
46576ea
add correction to fixedTarget runs, update calculation of cms energy
fisyak Sep 1, 2024
bbaaf85
remove ifdef StiTpcHitErrorMDF4_h
fisyak Sep 1, 2024
66b02fe
Fix typo
fisyak Sep 1, 2024
709d840
Add space before -DEVTGEN_EXTERNAL=1
fisyak Sep 10, 2024
987442b
use St_tpcTimeBucketCor only for new schema
fisyak Sep 11, 2024
75eaec9
Switch: ! NoTFGLDbTag => TFGDbTag
fisyak Sep 11, 2024
36ca1de
Merge branch 'main' into TFG24c.Export.Mini
fisyak Sep 13, 2024
d919c1d
Merge branch 'main' into TFG24c.Export.Mini
fisyak Oct 5, 2024
77be6db
Merge branch 'main' into TFG24c.Export.Mini
fisyak Oct 9, 2024
8acdf8e
Merge branch 'main' into TFG24c.Export.Mini
fisyak Oct 18, 2024
dc447f4
Merge branch 'main' into TFG24c.Export.Mini
fisyak Nov 19, 2024
8bc3333
Merge branch 'main' into TFG24c.Export.Mini
plexoos Dec 18, 2024
8a19542
Merge branch 'main' into TFG24c.Export.Mini
plexoos Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions Bfc.xml
fisyak marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration>

<configuration xmlns='http://logging.apache.org/'>

<appender name="stdout" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-3c{2}:%-5p - %m%n"/>
</layout>
<filter class="StarOptionFilter">
<!--
- - - - - - - - - - - - - -
RepeatMessageQuote
- - - - - - - - - - - - - -
"name" - "RepeatMessagesQuota" parameters to assign to number of messages to be repeated sequeintially
"value" = -1 there is no limit (by default)
> 0 the number of times the message can be printed out sequentially
(without any other message between each occurence)

the value zero and one have one and the same meaning
0 - the message can not be printed at all
1 - the message can be printed one time only, so "0" == "1"
Example:
- - - - <param name="RepeatMessagesQuota" value="2"/>
Print each message no more then 2 times sequientialy at most.
- - - - - - - - - - - - - -
TotalMessagesQuote
- - - - - - - - - - - - - -
"name" - "TotalMessagesQuota" parameters to assign to number of messages to be repeated sequeintially
"value" = -1 there is no limit (by default)
> 0 the number of times the message can printed out across the entire output
the value zero and one have one and the same meaning
0 - the message can not be printed at all
1 - the message can be printed one time only, so "0" == "1"
Example:
- - - - <param name="TotalMessagesQuota" value="200"/>
The output should contain the 200 lines at most.
- - - - - - - - - - - - - -
StringToCount
- - - - - - - - - - - - - -
"name" - "StringToCount" parameters define the string pattern to apply the "counter" paramters above
"value" = "Some string" that the user message should contain to be counted
as "RepeatMessageQuote" and /or "TotalMessagesQuote" define
> 0 the number of times the message can printed out across the entire output
the value zero and one have one and the same meaning
0 - there is no repeatition, the message can be printed at once
1 - the message can be printed one times only, so "0" == "1"
Example:
- - - - <param name="StringToCount" value="TPC"/>
Count only the messages with the string "TPC" in.
-->
<!-- <param name="RepeatMessageQuote" value="2"/> -->
<!-- <param name="StringToCount" value="My string to filter out pattern"/> -->
<!-- <param name="StringToCount" value="StageID="/> -->
<!-- <param name="RepeatMessageQuote" value="0"/> -->
<param name="RepeatMessageQuote" value="0"/>
</filter>
<filter class="StringMatchFilter">
<!--
Define the pattern to skip the embedded job tracking messages those contain the pattern
"StepEventId"
-->
<param name="StringToMatch" value="StageID=" />
<param name="AcceptOnMatch" value="false" />
<param name="AcceptOnMatch" value="StTriggerSimuMaker" />

</filter>

</appender>


<appender name="MYSQL" class="org.apache.log4j.MySQLAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="INSERT INTO StarLogger VALUES (&quot;%-3c{2}:%-5p %d - %m&quot;);"/>
</layout>
</appender>


<root>
<!-- <priority value ="DEBUG" /> -->
<priority value ="INFO" />
<appender-ref ref="stdout" />
<!--- <appender-ref ref="MYSQL" /> -->
</root>

</configuration>
117 changes: 61 additions & 56 deletions StRoot/StBFChain/BigFullChain.h

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions StRoot/StBFChain/StBFChain.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ Int_t StBFChain::Instantiate()
// Determine flavors
TString flavors = "ofl"; // default flavor for offline

// TFG specific Db tag
if (! GetOption("NoTFGLDbTag")) flavors += "+TFG";
// fixed target flavor
if (GetOption("FXT")) flavors.Prepend("FXT+");

Expand Down Expand Up @@ -761,6 +763,8 @@ Int_t StBFChain::Instantiate()
if ( GetOption("useLDV") ) mk->SetAttr("useLDV",kTRUE) ;// uses laserDV database
if ( GetOption("useCDV") ) mk->SetAttr("useCDV",kTRUE) ;// uses ofl database
if ( GetOption("useNewLDV") ) mk->SetAttr("useNewLDV",kTRUE);// uses new laserDV
if ( GetOption("Alignment2024") ) mk->SetAttr("Alignment2024",kTRUE);// uses new Alignment2024
if ( GetOption("Cosmics") ) mk->SetAttr("Cosmics" ,kTRUE);
if ( GetOption("shadow") ) mk->SetAttr("NoReset",kTRUE);// no resetting ExB
if ( GetOption("ExB")){
mk->SetAttr("ExB", kTRUE); // bit 0 is ExB ON or OFF
Expand Down Expand Up @@ -1922,6 +1926,18 @@ void StBFChain::SetDbOptions(StMaker *mk){
if (GetOption("NoSsdIt")) {mk->SetAttr("blacklist", "ssd"); gMessMgr->QAInfo() << "blacklist ssd" << endm;}
if (GetOption("NoSstIt")) {mk->SetAttr("blacklist", "sst"); gMessMgr->QAInfo() << "blacklist sst" << endm;}
}
if (GetOption("TFGdbOpt")) {
const Char_t *TFGTables[] = {"tpcSectorT0offset", "starTriggerDelay",
"TpcPosition", "TpcHalfPosition", "TpcWheelPosition",
"TpcSuperSectorPositionB", "TpcSuperSectorPositionD",
"TpcInnerSectorPositionB", "TpcOuterSectorPositionB",
"tpcBXT0CorrEPD", "tpcTimeBucketCor", 0};
LOG_INFO << "TFG version for TPC alignment parameters" << endm;
for (Int_t i = 0; TFGTables[i]; i++) {
LOG_INFO << "SetFlavor(\"TFG\",\"" << TFGTables[i] << "\"); // disable sim+ofl" << endm;
mk->SetFlavor("TFG",TFGTables[i]);
}
}
}
//_____________________________________________________________________
/// Creates output-tree branches
Expand Down
4 changes: 2 additions & 2 deletions StRoot/StDbUtilities/StGlobalDirection.hh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
class StGlobalDirection : public StGlobalCoordinate {
public:
StGlobalDirection() : StGlobalCoordinate() {}
StGlobalDirection(const double x, const double y, const double z) :
StGlobalCoordinate(x,y,z) {}
StGlobalDirection(const double x, const double y, const double z) : StGlobalCoordinate(x,y,z) {}
StGlobalDirection(const double *x) : StGlobalCoordinate(x) { }
StGlobalDirection(const StThreeVector<double>& xyz) : StGlobalCoordinate(xyz) {}
StGlobalDirection(const StThreeVectorF& xyz) : StGlobalCoordinate(xyz) {}
virtual ~StGlobalDirection() {};
Expand Down
3 changes: 3 additions & 0 deletions StRoot/StDbUtilities/StTpcCoordinate.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "StTpcLocalSectorAlignedCoordinate.hh"
#include "StTpcLocalSectorDirection.hh"
#include "StTpcLocalSectorCoordinate.hh"
#include "Stiostream.h"
fisyak marked this conversation as resolved.
Show resolved Hide resolved
//________________________________________________________________________________
StTpcLocalCoordinate::StTpcLocalCoordinate(double x, double y, double z) : StTpcCoordinate(x,y,z,0,0) {}
//________________________________________________________________________________
Expand All @@ -21,6 +22,8 @@ ostream& operator<<(ostream& os, const StTpcCoordinate& a) {
return os << OS;
}
//________________________________________________________________________________
void StTpcCoordinate::Print(Option_t *option) const {cout << *this << endl;}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the use of cout and endl prompt the inclusion of Stiostream.h? If so, just add using std::cout; using std::endl; somewhere in this file

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignored

//________________________________________________________________________________
ostream& operator<<(ostream& os, const StTpcLocalDirection& a) {
return os << "TPC_Local Direction( (" << OS;
}
Expand Down
2 changes: 1 addition & 1 deletion StRoot/StDbUtilities/StTpcCoordinate.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/
#ifndef ST_TPC_COORDINATE_H
#define ST_TPC_COORDINATE_H
#include "Stiostream.h"
#include "StThreeVector.hh"

class StTpcCoordinate {
Expand All @@ -27,6 +26,7 @@ class StTpcCoordinate {
virtual void setPosition(StThreeVector<double>& position) { mPosition = position; }
virtual void setSector(Int_t sector) { mFromSector = sector; }
virtual void setRow(Int_t row) { mFromRow = row; }
virtual void Print(Option_t *option="") const;
protected:
StThreeVector<double> mPosition;
Int_t mFromSector;
Expand Down
Loading
Loading