Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Comments

Close side panel

Detectors are renamed - FT0 and FV0 #2278

Merged
shahor02 merged 46 commits intoAliceO2Group:devAliceO2Group/AliceO2:devfrom
AllaMaevskaya:FT0_FV0AllaMaevskaya/AliceO2:FT0_FV0Copy head branch name to clipboard
Jul 31, 2019
Merged

Detectors are renamed - FT0 and FV0 #2278
shahor02 merged 46 commits intoAliceO2Group:devAliceO2Group/AliceO2:devfrom
AllaMaevskaya:FT0_FV0AllaMaevskaya/AliceO2:FT0_FV0Copy head branch name to clipboard

Conversation

@AllaMaevskaya
Copy link
Contributor

No description provided.

@AllaMaevskaya AllaMaevskaya requested review from a team and ktf as code owners July 30, 2019 07:08
Copy link
Collaborator

@shahor02 shahor02 left a comment

Choose a reason for hiding this comment

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

Please see comments below. Also, either squash all commits to one, or I can do this at merging (the message of the 1st commit will be assigned)

}

///< number of validated V0 candidates (at most 2 are possible)
///< number of validated FV0 candidates (at most 2 are possible)
Copy link
Collaborator

Choose a reason for hiding this comment

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

I've already commented on this in the previous PR #2255 (comment), these are secondary vertices V0s, please revert this file

double bz = 5.0;

// create V0
// create FV0
Copy link
Collaborator

Choose a reason for hiding this comment

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

this also

TVector3 startMom, double startE,
double endTime, double eLoss, Int_t particlePdg)
o2::fv0::Hit* Detector::addHit(Int_t trackId, Int_t cellId,
TVector3 startPos, TVector3 endPos,
Copy link
Collaborator

Choose a reason for hiding this comment

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

No need to use TObject based virtual object to transfer the position/momentum, please change this to Point3D<float> or Vector3D<float>, also in related methods

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed now

TH2S* getHistoT0(ROC roc, Bool_t force)
{
return getHistogram(roc, mT0Histograms, mNbinsT0, mXminT0, mXmaxT0, "T0", force);
return getHistogram(roc, mT0Histograms, mNbinsT0, mXminT0, mXmaxT0, "FT0", force);
Copy link
Collaborator

Choose a reason for hiding this comment

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

This one also was commented in the prev. PR https://stackoverflow.com/questions/32766151/check-for-optionally-targets-in-cmake-that-are-not-in-the-correct-order, it is for TPC start time, revert this file please

{
auto f = std::unique_ptr<TFile>(TFile::Open(filename.c_str(), "recreate"));
f->WriteObject(&mT0, "T0");
f->WriteObject(&mT0, "T0");
Copy link
Collaborator

Choose a reason for hiding this comment

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

this one too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry, I did not check, I was sure he fixed this...


enum ETrackType {
Standard,
Standard,
Copy link
Collaborator

Choose a reason for hiding this comment

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

This one also is for secondary vertices, revert.

@AllaMaevskaya AllaMaevskaya force-pushed the FT0_FV0 branch 4 times, most recently from caac918 to 6fbc499 Compare July 31, 2019 09:14
@AllaMaevskaya
Copy link
Contributor Author

We satisfied all requests, yes?

@shahor02
Copy link
Collaborator

Hi @AllaMaevskaya
almost, I've fixed the rest, will squash and merge once tests are passed.

@shahor02 shahor02 merged commit 527d2a2 into AliceO2Group:dev Jul 31, 2019
knopers8 pushed a commit to knopers8/AliceO2 that referenced this pull request Oct 23, 2019
* T0 and V0 namespace changes

* clang-format fixes

* T0 string changes

* clang-format fixes

* T0 function names, variables, file path

* renaming files, directories, #includes, cmakes

* more file renames, directory renames

* V0 string changes

* V0 comments, variables, and functions

* updated V0 variable

* more T0 strings, comments, and FITT0, FIT_T0

* more T0 strings, comments, and FITT0, FIT_T0 again

* FIT V0 renames

* lowercase t0 changes

* V0 file and directory names, T0 string

* Clang format fixes

* fixing erroneous T0 and V0 changes

* T0 and V0 namespace changes

* clang-format fixes

* T0 string changes

* clang-format fixes

* T0 function names, variables, file path

* renaming files, directories, #includes, cmakes

* more file renames, directory renames

* V0 string changes

* V0 comments, variables, and functions

* updated V0 variable

* more T0 strings, comments, and FITT0, FIT_T0

* more T0 strings, comments, and FITT0, FIT_T0 again

* FIT V0 renames

* lowercase t0 changes

* V0 file and directory names, T0 string

* Clang format fixes

* fixing erroneous T0 and V0 changes

* Clang format fixed

* Revert "fixing erroneous T0 and V0 changes"

This reverts commit 30ba3bd.

* Revert "Clang format fixed"

This reverts commit ebbebd7.

* clang format fixes

* fixing erroneous T0 and V0 changes

* Simplify containers in FV0 from TVector3's to TPoint3D and TVector3D

* merge conflict solved

* clang format after merge

* revert accidental changes

* Update testDCAFitter.cxx
carlos-soncco pushed a commit to carlos-soncco/AliceO2 that referenced this pull request Oct 28, 2019
* T0 and V0 namespace changes

* clang-format fixes

* T0 string changes

* clang-format fixes

* T0 function names, variables, file path

* renaming files, directories, #includes, cmakes

* more file renames, directory renames

* V0 string changes

* V0 comments, variables, and functions

* updated V0 variable

* more T0 strings, comments, and FITT0, FIT_T0

* more T0 strings, comments, and FITT0, FIT_T0 again

* FIT V0 renames

* lowercase t0 changes

* V0 file and directory names, T0 string

* Clang format fixes

* fixing erroneous T0 and V0 changes

* T0 and V0 namespace changes

* clang-format fixes

* T0 string changes

* clang-format fixes

* T0 function names, variables, file path

* renaming files, directories, #includes, cmakes

* more file renames, directory renames

* V0 string changes

* V0 comments, variables, and functions

* updated V0 variable

* more T0 strings, comments, and FITT0, FIT_T0

* more T0 strings, comments, and FITT0, FIT_T0 again

* FIT V0 renames

* lowercase t0 changes

* V0 file and directory names, T0 string

* Clang format fixes

* fixing erroneous T0 and V0 changes

* Clang format fixed

* Revert "fixing erroneous T0 and V0 changes"

This reverts commit 30ba3bd.

* Revert "Clang format fixed"

This reverts commit ebbebd7.

* clang format fixes

* fixing erroneous T0 and V0 changes

* Simplify containers in FV0 from TVector3's to TPoint3D and TVector3D

* merge conflict solved

* clang format after merge

* revert accidental changes

* Update testDCAFitter.cxx
EmilGorm pushed a commit to EmilGorm/AliceO2 that referenced this pull request Apr 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.