Skip to content

Commit

Permalink
s122_mar24
Browse files Browse the repository at this point in the history
  • Loading branch information
pcget committed Apr 24, 2024
1 parent b6602b9 commit 4bdfa94
Show file tree
Hide file tree
Showing 48 changed files with 4,352 additions and 300 deletions.
3 changes: 3 additions & 0 deletions asydata/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ set(SRCS
chimeraData/R3BAsyChimeraPoint.cxx
chimeraData/R3BAsyChimeraHitData.cxx
chimeraData/R3BAsyChimeraMappedData.cxx
chimeraData/R3BAsyChimeraArrayData.cxx
krabData/R3BAsyKrabPoint.cxx
krabData/R3BAsyKrabHitData.cxx
krabData/R3BAsyKrabMappedData.cxx
krabData/R3BAsyKrabArrayData.cxx
)


Expand Down
3 changes: 3 additions & 0 deletions asydata/R3BAsyDataLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
#pragma link C++ class R3BAsyChimeraPoint+;
#pragma link C++ class R3BAsyChimeraHitData+;
#pragma link C++ class R3BAsyChimeraMappedData+;
#pragma link C++ class R3BAsyChimeraArrayData+;
#pragma link C++ class R3BAsyKrabPoint+;
#pragma link C++ class R3BAsyKrabHitData+;
#pragma link C++ class R3BAsyKrabMappedData+;
#pragma link C++ class R3BAsyKrabArrayData+;
#endif
63 changes: 63 additions & 0 deletions asydata/chimeraData/R3BAsyChimeraArrayData.cxx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// --------------------------------------------------------------------------
// ----- R3BAsyChimeraArrayData source file ------
// --------------------------------------------------------------------------

#include "R3BAsyChimeraArrayData.h"

#include "FairLogger.h"

R3BAsyChimeraArrayData::R3BAsyChimeraArrayData()
: fMulti(0),
fDet(0),
fSide(0),
fStrip(0),
fRawEnergy(0),
fRawTime(0),
fMultiE12(0),
fMultiEFB1(0) {}

R3BAsyChimeraArrayData::R3BAsyChimeraArrayData(UInt_t multi, UInt_t* detector,
UInt_t* side, UInt_t* strip,
UInt_t* energy, UInt_t* time,
UInt_t multiE12,
UInt_t multiEFB1)
: fMulti(multi),
fDet(detector),
fSide(side),
fStrip(strip),
fRawEnergy(energy),
fRawTime(time),
fMultiE12(multiE12),
fMultiEFB1(multiEFB1) {
// fMulti=multi;
// LOG(info) << "R3BAsyChimeraArrayData::new entry";

/*
fDet=new UInt_t[multi];
fSide=new UInt_t[multi];
fStrip=new UInt_t[multi];
fRawEnergy=new UInt_t[multi];
fRawTime=new UInt_t[multi];
fDet=detector;
fSide=side;
fStrip=strip;
fRawEnergy=energy;
fRawTime=time;*/
}
UInt_t R3BAsyChimeraArrayData::GetMulti() const { return fMulti; }

UInt_t R3BAsyChimeraArrayData::GetDetectorId(int i) const { return fDet[i]; }

UInt_t R3BAsyChimeraArrayData::GetSideId(int i) const { return fSide[i]; }

UInt_t R3BAsyChimeraArrayData::GetStripId(int i) const { return fStrip[i]; }

UInt_t R3BAsyChimeraArrayData::GetEnergy(int i) const { return fRawEnergy[i]; }

UInt_t R3BAsyChimeraArrayData::GetTime(int i) const { return fRawTime[i]; }

UInt_t R3BAsyChimeraArrayData::GetMultiE12() const { return fMultiE12; }

UInt_t R3BAsyChimeraArrayData::GetMultiEFB1() const { return fMultiEFB1; }

ClassImp(R3BAsyChimeraArrayData)
55 changes: 55 additions & 0 deletions asydata/chimeraData/R3BAsyChimeraArrayData.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// -------------------------------------------------------------------------
// ----- R3BAsyChimeraArrayData header file -----
// ----- Created 19/04/24 by E. De Filippo and P. Russotto -----
// -------------------------------------------------------------------------

/******************************************************************************
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
* Copyright (C) 2019-2024 Members of R3B Collaboration *
* *
* This software is distributed under the terms of the *
* GNU General Public Licence (GPL) version 3, *
* copied verbatim in the file "LICENSE". *
* *
* In applying this license GSI does not waive the privileges and immunities *
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
******************************************************************************/

#ifndef R3BASYCHIMERAARRAYITEM_H
#define R3BASYCHIMERAARRAYITEM_H

#include "TObject.h"
const int dmaxx = 128;

class R3BAsyChimeraArrayData : public TObject {
public:
R3BAsyChimeraArrayData();
R3BAsyChimeraArrayData(UInt_t, UInt_t *, UInt_t *, UInt_t *, UInt_t *,
UInt_t *, UInt_t, UInt_t);
virtual ~R3BAsyChimeraArrayData() {}

UInt_t GetMulti() const;
UInt_t GetDetectorId(int) const;
UInt_t GetSideId(int) const;
UInt_t GetStripId(int) const;
UInt_t GetEnergy(int) const;
UInt_t GetTime(int) const;
UInt_t GetMultiE12() const;
UInt_t GetMultiEFB1() const;

private:
UInt_t fMulti;
UInt_t *fDet; //[fMulti]
UInt_t *fSide; //[fMulti]
UInt_t *fStrip; //[fMulti]
UInt_t *fRawEnergy; //[fMulti]
UInt_t *fRawTime; //[fMulti]
UInt_t fMultiE12;
UInt_t fMultiEFB1;

public:
ClassDef(R3BAsyChimeraArrayData, 1)
};

#endif
15 changes: 14 additions & 1 deletion asydata/chimeraData/R3BAsyChimeraHitData.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
// -------------------------------------------------------------------
// ----- R3BAsyChimeraHitData header file ------
// ----- Created 27/03/23 by E. De Filippo and P. Russotto ------
// ----- Created 19/04/24 by E. De Filippo and P. Russotto ------
// -------------------------------------------------------------------

/******************************************************************************
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
* Copyright (C) 2019-2024 Members of R3B Collaboration *
* *
* This software is distributed under the terms of the *
* GNU General Public Licence (GPL) version 3, *
* copied verbatim in the file "LICENSE". *
* *
* In applying this license GSI does not waive the privileges and immunities *
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
******************************************************************************/

#ifndef R3BAsyChimeraHitData_H
#define R3BAsyChimeraHitData_H
#include "TObject.h"
Expand Down
15 changes: 3 additions & 12 deletions asydata/chimeraData/R3BAsyChimeraMappedData.cxx
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/******************************************************************************
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
* Copyright (C) 2019-2024 Members of R3B Collaboration *
* *
* This software is distributed under the terms of the *
* GNU General Public Licence (GPL) version 3, *
* copied verbatim in the file "LICENSE". *
* *
* In applying this license GSI does not waive the privileges and immunities *
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
******************************************************************************/
// --------------------------------------------------------------------------
// ----- R3BAsyChimeraMappedData source file ------
// --------------------------------------------------------------------------

#include "R3BAsyChimeraMappedData.h"

Expand Down
5 changes: 5 additions & 0 deletions asydata/chimeraData/R3BAsyChimeraMappedData.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// -------------------------------------------------------------------------
// ----- R3BAsyChimeraMappedData header file -----
// ----- Created 19/04/24 by E. De Filippo and P. Russotto -----
// -------------------------------------------------------------------------

/******************************************************************************
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
* Copyright (C) 2019-2024 Members of R3B Collaboration *
Expand Down
16 changes: 15 additions & 1 deletion asydata/chimeraData/R3BAsyChimeraPoint.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
// -------------------------------------------------------------------------
// ----- R3BAsyChimeraPoint header file -----
// ----- Created 27/03/23 by E. De Filippo and P. Russotto -----
// ----- Created 19/04/24 by E. De Filippo and P. Russotto -----
// -------------------------------------------------------------------------

/******************************************************************************
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
* Copyright (C) 2019-2024 Members of R3B Collaboration *
* *
* This software is distributed under the terms of the *
* GNU General Public Licence (GPL) version 3, *
* copied verbatim in the file "LICENSE". *
* *
* In applying this license GSI does not waive the privileges and immunities *
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
******************************************************************************/

/** R3BAsyChimeraPoint.h
**/
Expand Down
40 changes: 40 additions & 0 deletions asydata/krabData/R3BAsyKrabArrayData.cxx
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// ---------------------------------------------------------------------------
// ----- R3BAsyKrabArrayData source file ------
// ---------------------------------------------------------------------------

/******************************************************************************
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
* Copyright (C) 2019-2024 Members of R3B Collaboration *
* *
* This software is distributed under the terms of the *
* GNU General Public Licence (GPL) version 3, *
* copied verbatim in the file "LICENSE". *
* *
* In applying this license GSI does not waive the privileges and immunities *
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
******************************************************************************/

#include "R3BAsyKrabArrayData.h"

#include "FairLogger.h"

R3BAsyKrabArrayData::R3BAsyKrabArrayData()
: fMulti(0), fRP(-1000), fRing(0), fSector(0), fPhi(0) {}

R3BAsyKrabArrayData::R3BAsyKrabArrayData(UInt_t multi, Double_t rp,
UInt_t* ring, UInt_t* sector,
Float_t* phi)
: fMulti(multi), fRP(rp), fRing(ring), fSector(sector), fPhi(phi) {}

UInt_t R3BAsyKrabArrayData::GetMulti() const { return fMulti; }

Double_t R3BAsyKrabArrayData::GetRP() const { return fRP; }

UInt_t R3BAsyKrabArrayData::GetRing(int i) const { return fRing[i]; }

UInt_t R3BAsyKrabArrayData::GetSector(int i) const { return fSector[i]; }

Float_t R3BAsyKrabArrayData::GetPhi(int i) const { return fPhi[i]; }

ClassImp(R3BAsyKrabArrayData)
47 changes: 47 additions & 0 deletions asydata/krabData/R3BAsyKrabArrayData.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// --------------------------------------------------------------------------
// ----- R3BAsyKrabArrayData header file ------
// ----- Created 19/04/24 by E. De Filippo and P. Russotto ------
// --------------------------------------------------------------------------

/******************************************************************************
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
* Copyright (C) 2019-2024 Members of R3B Collaboration *
* *
* This software is distributed under the terms of the *
* GNU General Public Licence (GPL) version 3, *
* copied verbatim in the file "LICENSE". *
* *
* In applying this license GSI does not waive the privileges and immunities *
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
******************************************************************************/

#ifndef R3BASYKRABARRAYITEM_H
#define R3BASYKRABARRAYITEM_H

#include "TObject.h"

class R3BAsyKrabArrayData : public TObject {
public:
R3BAsyKrabArrayData();
R3BAsyKrabArrayData(UInt_t, Double_t, UInt_t *, UInt_t *, Float_t *);
virtual ~R3BAsyKrabArrayData() {}

UInt_t GetMulti() const;
Double_t GetRP() const;
UInt_t GetRing(int) const;
UInt_t GetSector(int) const;
Float_t GetPhi(int) const;

private:
UInt_t fMulti;
Double_t fRP;
UInt_t *fRing; //[fMulti]
UInt_t *fSector; //[fMulti]
Float_t *fPhi; //[fMulti]

public:
ClassDef(R3BAsyKrabArrayData, 1)
};

#endif
2 changes: 1 addition & 1 deletion asydata/krabData/R3BAsyKrabHitData.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// ----- R3BAsyKrabHitData source file ------
// ----- R3BAsyKrabHitData source file ------
// ---------------------------------------------------------------------------

#include "R3BAsyKrabHitData.h"
Expand Down
15 changes: 14 additions & 1 deletion asydata/krabData/R3BAsyKrabHitData.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
// -------------------------------------------------------------------
// ----- R3BAsyKrabHitData header file ------
// ----- R3BAsyKrabHitData header file ------
// ----- Created 24/10/23 by E. De Filippo and P. Russotto ------
// -------------------------------------------------------------------

/******************************************************************************
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
* Copyright (C) 2019-2024 Members of R3B Collaboration *
* *
* This software is distributed under the terms of the *
* GNU General Public Licence (GPL) version 3, *
* copied verbatim in the file "LICENSE". *
* *
* In applying this license GSI does not waive the privileges and immunities *
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
******************************************************************************/

#ifndef R3BAsyKrabHitData_H
#define R3BAsyKrabHitData_H
#include "TObject.h"
Expand Down
24 changes: 24 additions & 0 deletions asydata/krabData/R3BAsyKrabMappedData.cxx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// ---------------------------------------------------------------------------
// ----- R3BAsyKrabMappedData source file ------
// ---------------------------------------------------------------------------

#include "R3BAsyKrabMappedData.h"

R3BAsyKrabMappedData::R3BAsyKrabMappedData()
: fRing(-1), fSector(-1), fPhi(-1000), fqx(-1000), fqy(-1000) {}

R3BAsyKrabMappedData::R3BAsyKrabMappedData(UInt_t ring, UInt_t sector,
Float_t phi, Float_t qx, Float_t qy)
: fRing(ring), fSector(sector), fPhi(phi), fqx(qx), fqy(qy) {}

UInt_t R3BAsyKrabMappedData::GetRing() const { return fRing; }

UInt_t R3BAsyKrabMappedData::GetSector() const { return fSector; }

Float_t R3BAsyKrabMappedData::GetPhi() const { return fPhi; }

Float_t R3BAsyKrabMappedData::Getqx() const { return fqx; }

Float_t R3BAsyKrabMappedData::Getqy() const { return fqy; }

ClassImp(R3BAsyKrabMappedData)
Loading

0 comments on commit 4bdfa94

Please sign in to comment.