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.

Sign up for GitHub

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

Fix the issues causing FST codes not running #338

Merged
merged 1 commit into from
Apr 26, 2022
Merged

Fix the issues causing FST codes not running #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 2 additions & 14 deletions StRoot/StBFChain/BigFullChain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,7 @@ Bfc_st BFC[] = { // standard chains
{"StEvent" ,"","","globT,SCL,TRGDef,StBichsel,EmcUtil,TbUtil,detDb","","StEvent","Load StEvent",kFALSE},
{"PxlUtil" ,"" ,"","","", "StPxlUtil","Load StPxlUtil",kFALSE},
{"IstUtil" ,"" ,"","","", "StIstUtil","Load StIstUtil",kFALSE},
{"FstUtil" ,"" ,"","","", "StFstUtil","Load StFstUtil",kFALSE},
{"SsdUtil" ,"" ,"","StarMagField,StEvent","" ,"Geom,StSsdUtil","Load SSD Util",kFALSE},
{"SstUtil" ,"" ,"","StarMagField,StEvent","" ,"Geom,StSstUtil","Load SST Util",kFALSE},
{"EmcUtil" ,"" ,"","emc_T,geomT,StDbT","" ,"StEmcUtil","Load StEmcUtil",kFALSE},
Expand Down Expand Up @@ -1580,25 +1581,12 @@ Bfc_st BFC[] = { // standard chains
{"fst","fstChain","","fstRawHit,fstCluster,fstHit", "StMaker","StChain","FST chain" ,kFALSE},
{"fstFastSim","","fstChain","StMcEvent,StEvent","StFstFastSimMaker","StFstSimMaker","FST fast simulator",
kFALSE},
{"fstRawHit", "", "fstChain", "fstUtil,fstDb","StFstRawHitMaker", "StFstRawHitMaker","FST raw hit maker",
{"fstRawHit", "", "fstChain", "FstUtil,fstDb","StFstRawHitMaker", "StFstRawHitMaker","FST raw hit maker",
kFALSE},
{"fstCluster", "", "fstChain", "fstRawHit","StFstClusterMaker", "StFstClusterMaker","FST Cluster maker",
kFALSE},
{"fstHit", "", "fstChain", "event,fstCluster", "StFstHitMaker", "StFstHitMaker","FST Hit Maker",
kFALSE},
{"fstUtil" , "", "", "", "", "StFstUtil", "Fst Utilities",
kFALSE},

{"fstFastSim","fstChain","","StMcEvent,StEvent","StFstFastSimMaker","StFstSimMaker","FST fast simulator",
kFALSE},
{"fstRawHit", "", "fstChain", "fstUtil,fstDb","StFstRawHitMaker", "StFstRawHitMaker","FST raw hit maker",
kFALSE},
{"fstCluster", "", "fstChain", "fstRawHit","StFstClusterMaker", "StFstClusterMaker","FST Cluster maker",
kFALSE},
{"fstHit", "", "fstChain", "event,fstCluster", "StFstHitMaker", "StFstHitMaker","FST Hit Maker",
kFALSE},
{"fstUtil" , "", "fstChain", "", "", "StFstUtil", "Fst Utilities",
kFALSE},
Comment on lines -1591 to -1601
Copy link
Member

Choose a reason for hiding this comment

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

Indeed these lines appear to be identical to the ones above them. These were approved twice in #266 and #282 about 3 and 2 months ago. So much for the huge PRs


{"ssddat" ,"","","ssd_daq" ,"","","SSD full chain for Real Data",kFALSE},
{"sstdat" ,"","","sst_daq" ,"","","SST full chain for Real Data",kFALSE},
Expand Down
2 changes: 1 addition & 1 deletion StarDb/Geometry/fst/fstSensorOnWedge.20211110.000001.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ St_Survey *tableSet = new St_Survey("fstSensorOnWedge",108);
//
for(int i = 0; i < 108; i++){
memset(&row,0,tableSet->GetRowSize());
row.Id = i+1;
row.Id = i+1000;
Copy link
Member

Choose a reason for hiding this comment

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

Could you point to the code where it is used so we can see the problem?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure if somewhere else will be affected, but for what I tested, the problem is in StRoot/StFstHitMaker/StFstHitMaker.cxx:
The database is loaded with StFstDb and the table is assigned to a variable on line 44.
This variable is then used on line 192 for transforming the coordinates of the hit positions.
As defined on line 191, the sensorId should begin with 1000.

Copy link
Member

Choose a reason for hiding this comment

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

Thank you, Techuan. I added Xu and Zhenyu here to make sure everyone is on the same page.
On a separate note, Xu and Zhenyu, as the PoC of FST are not listed as the code maintainers for StarDb/xxx/fst directory. I feel we may want to specify this, also for other subsystems, so the PRs can automatically pick up the reviewers.

Copy link
Member

Choose a reason for hiding this comment

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

the sensorId should begin with 1000

Ok, I see that in the corresponding database table these sensor ids start from 1000, so this macro is supposed to follow the same numbering.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Dmitri, thanks for checking.
Since there are already two reviewers approved, should we go ahead to merge this PR or we need to wait for your approval?

Copy link
Member

Choose a reason for hiding this comment

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

The formal requirements are met, so merge it anytime

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I will click the merge button.

row.r00 = 1.0;
row.r01 = 0.0;
row.r02 = 0.0;
Expand Down