Detectors are renamed - FT0 and FV0 by AllaMaevskaya · Pull Request #2278 · AliceO2Group/AliceO2

AllaMaevskaya · 2019-07-30T07:08:38Z

No description provided.

shahor02

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)

shahor02 · 2019-07-30T07:42:31Z

Detectors/Base/include/DetectorsBase/DCAFitter.h

  }

-  ///< number of validated V0 candidates (at most 2 are possible)
+  ///< number of validated FV0 candidates (at most 2 are possible)


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

shahor02 · 2019-07-30T07:42:48Z

Detectors/Base/test/testDCAFitter.cxx

  double bz = 5.0;

-  // create V0
+  // create FV0


shahor02 · 2019-07-30T07:47:48Z

Detectors/FIT/FV0/simulation/src/Detector.cxx

-                              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,


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

shahor02 · 2019-07-30T07:53:09Z

Detectors/TPC/calibration/include/TPCCalibration/CalibPulser.h

    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);


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

shahor02 · 2019-07-30T07:53:24Z

Detectors/TPC/calibration/src/CalibPulser.cxx

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


this one too.

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

shahor02 · 2019-07-30T07:53:57Z

EventVisualisation/DataConverter/include/EventVisualisationDataConverter/ConversionConstants.h


 enum ETrackType {
-    Standard,
+  Standard,


This one also is for secondary vertices, revert.

This reverts commit 30ba3bd.

This reverts commit ebbebd7.

AllaMaevskaya · 2019-07-31T14:59:37Z

We satisfied all requests, yes?

shahor02 · 2019-07-31T17:01:03Z

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

* 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

rnevils added 30 commits July 26, 2019 14:36

T0 and V0 namespace changes

41df67a

clang-format fixes

95eb4d3

T0 string changes

dc2e4c9

clang-format fixes

ae299d3

T0 function names, variables, file path

7fa175f

renaming files, directories, #includes, cmakes

e8c8d8d

more file renames, directory renames

9f17ce3

V0 string changes

a2dadf6

V0 comments, variables, and functions

afdf746

updated V0 variable

f98f330

more T0 strings, comments, and FITT0, FIT_T0

454ba2d

more T0 strings, comments, and FITT0, FIT_T0 again

a0c7cc8

FIT V0 renames

778a144

lowercase t0 changes

0e9e0c2

V0 file and directory names, T0 string

ae939a7

Clang format fixes

c7b70c4

fixing erroneous T0 and V0 changes

ecdc23a

T0 and V0 namespace changes

e9805bd

clang-format fixes

8b6f353

T0 string changes

bd9bd12

clang-format fixes

af4987e

T0 function names, variables, file path

ae9c795

renaming files, directories, #includes, cmakes

9b85dcc

more file renames, directory renames

a31c9f1

V0 string changes

4f2bde2

V0 comments, variables, and functions

860edfd

updated V0 variable

d980c3e

more T0 strings, comments, and FITT0, FIT_T0

d1cb108

more T0 strings, comments, and FITT0, FIT_T0 again

574123c

FIT V0 renames

1cdf12d

rnevils and others added 4 commits July 30, 2019 09:56

V0 file and directory names, T0 string

7034019

Clang format fixes

1b63d43

fixing erroneous T0 and V0 changes

30ba3bd

Clang format fixed

ebbebd7

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

shahor02 requested changes Jul 30, 2019

View reviewed changes

sawenzel assigned shahor02 Jul 30, 2019

AllaMaevskaya and others added 6 commits July 30, 2019 12:23

Revert "fixing erroneous T0 and V0 changes"

fb62c9c

This reverts commit 30ba3bd.

Revert "Clang format fixed"

442b499

This reverts commit ebbebd7.

revert

c8d8378

clang format fixes

2aa9db8

fixing erroneous T0 and V0 changes

ea97ab5

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

844b0aa

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

AllaMaevskaya added 2 commits July 31, 2019 14:14

Merge https://github.com/mslupeck/AliceO2 into macek

8d9645a

merge conflict solved

100d095

AllaMaevskaya force-pushed the FT0_FV0 branch from 1908c6c to 100d095 Compare July 31, 2019 11:32

clang format after merge

d89e0dc

shahor02 added 2 commits July 31, 2019 18:52

revert accidental changes

f393818

Update testDCAFitter.cxx

fab7bc4

shahor02 merged commit 527d2a2 into AliceO2Group:dev Jul 31, 2019

EmilGorm pushed a commit to EmilGorm/AliceO2 that referenced this pull request Apr 15, 2023

Change to more sensible defaults (AliceO2Group#2278)

2a4f79e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Detectors are renamed - FT0 and FV0 #2278

Detectors are renamed - FT0 and FV0 #2278
shahor02 merged 46 commits intoAliceO2Group:devfrom
AllaMaevskaya:FT0_FV0

AllaMaevskaya commented Jul 30, 2019

Uh oh!

shahor02 left a comment

Uh oh!

shahor02 Jul 30, 2019

Uh oh!

shahor02 Jul 30, 2019

Uh oh!

shahor02 Jul 30, 2019

Uh oh!

AllaMaevskaya Jul 31, 2019

Uh oh!

shahor02 Jul 30, 2019

Uh oh!

shahor02 Jul 30, 2019

Uh oh!

AllaMaevskaya Jul 30, 2019

Uh oh!

shahor02 Jul 30, 2019

Uh oh!

AllaMaevskaya commented Jul 31, 2019

Uh oh!

shahor02 commented Jul 31, 2019

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

Comments

Conversation

AllaMaevskaya commented Jul 30, 2019

Uh oh!

shahor02 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AllaMaevskaya commented Jul 31, 2019

Uh oh!

shahor02 commented Jul 31, 2019

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants