Skip to content

Commit 951505c

Browse files
authored
Migration of MCReplayEngine to vmc v2.0 (#30)
* Migration of MCReplayEngine to vmc v2.0 * Fixed typo in workflow step name
1 parent 2ad19ec commit 951505c

File tree

2 files changed

+33
-19
lines changed

2 files changed

+33
-19
lines changed

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
sudo apt install -y clang-format-11
1919
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100
2020
sudo update-alternatives --install /usr/bin/git-clang-format git-clang-format /usr/bin/git-clang-format-11 100
21-
- name: Run clang-foramt on changed files
21+
- name: Run clang-format on changed files
2222
run: |
2323
set -x
2424
git fetch origin ${{ github.event.pull_request.base.ref }}

MCReplay/include/MCReplay/MCReplayEngine.h

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,13 @@ class MCReplayEngine : public TVirtualMC
249249
/// - metals : absorption fraction (0<=x<=1)
250250
/// - effic Detection efficiency for UV photons
251251
/// - rindex Refraction index (if=0 metal)
252-
virtual void SetCerenkov(Int_t itmed, Int_t npckov, Float_t* ppckov, Float_t* absco, Float_t* effic, Float_t* rindex) override
252+
virtual void SetCerenkov(Int_t itmed, Int_t npckov, Float_t* ppckov, Float_t* absco, Float_t* effic, Float_t* rindex, Bool_t aspline = false, Bool_t rspline = false) override
253253
{
254254
Warning("SetCerenkov", "Not supported");
255255
}
256256

257257
/// The same as previous but in double precision
258-
virtual void SetCerenkov(Int_t itmed, Int_t npckov, Double_t* ppckov, Double_t* absco, Double_t* effic, Double_t* rindex) override
258+
virtual void SetCerenkov(Int_t itmed, Int_t npckov, Double_t* ppckov, Double_t* absco, Double_t* effic, Double_t* rindex, Bool_t aspline = false, Bool_t rspline = false) override
259259
{
260260
Warning("SetCerenkov", "Not supported");
261261
}
@@ -308,7 +308,7 @@ class MCReplayEngine : public TVirtualMC
308308
/// - pp value of photon momentum (in GeV)
309309
/// - values property values
310310
/// (Geant4 only)
311-
virtual void SetMaterialProperty(Int_t itmed, const char* propertyName, Int_t np, Double_t* pp, Double_t* values) override
311+
virtual void SetMaterialProperty(Int_t itmed, const char* propertyName, Int_t np, Double_t* pp, Double_t* values, Bool_t createNewKey = false, Bool_t spline = false) override
312312
{
313313
Warning("SetMaterialProperty", "Not supported");
314314
}
@@ -330,7 +330,7 @@ class MCReplayEngine : public TVirtualMC
330330
/// - pp value of photon momentum (in GeV)
331331
/// - values property values
332332
/// (Geant4 only)
333-
virtual void SetMaterialProperty(const char* surfaceName, const char* propertyName, Int_t np, Double_t* pp, Double_t* values) override
333+
virtual void SetMaterialProperty(const char* surfaceName, const char* propertyName, Int_t np, Double_t* pp, Double_t* values, Bool_t createNewKey = false, Bool_t spline = false) override
334334
{
335335
Warning("SetMaterialProperty", "Not supported");
336336
}
@@ -424,22 +424,29 @@ class MCReplayEngine : public TVirtualMC
424424
// ------------------------------------------------
425425
//
426426

427-
/// Set a sensitive detector to a volume
428-
/// - volName - the volume name
429-
/// - sd - the user sensitive detector
430-
// TODO To be implemented
431-
//virtual void SetSensitiveDetector(const TString &volName, TVirtualMCSensitiveDetector *sd) override;
427+
// Set a sensitive detector to a volume
428+
// - volName - the volume name
429+
// - sd - the user sensitive detector
430+
virtual void SetSensitiveDetector(const TString& volName, TVirtualMCSensitiveDetector* sd) override
431+
{
432+
Warning("SetSensitiveDetector", "Not supported");
433+
}
432434

433-
/// Get a sensitive detector of a volume
434-
/// - volName - the volume name
435-
// TODO To be implemented
436-
//virtual TVirtualMCSensitiveDetector *GetSensitiveDetector(const TString &volName) const override;
435+
// Get a sensitive detector of a volume
436+
// - volName - the volume name
437+
virtual TVirtualMCSensitiveDetector* GetSensitiveDetector(const TString& volName) const override
438+
{
439+
Warning("GetSensitiveDetector", "Not supported");
440+
return nullptr;
441+
}
437442

438-
/// The scoring option:
439-
/// if true, scoring is performed only via user defined sensitive detectors and
440-
/// MCApplication::Stepping is not called
441-
// TODO To be implemented
442-
//virtual void SetExclusiveSDScoring(Bool_t exclusiveSDScoring) override;
443+
// The scoring option:
444+
// if true, scoring is performed only via user defined sensitive detectors and
445+
// MCApplication::Stepping is not called
446+
virtual void SetExclusiveSDScoring(Bool_t exclusiveSDScoring) override
447+
{
448+
Warning("SetExclusiveSDScoring", "Not supported");
449+
}
443450

444451
//
445452
// ------------------------------------------------
@@ -1051,6 +1058,13 @@ class MCReplayEngine : public TVirtualMC
10511058
ProcessEvent(mCurrentEvent);
10521059
}
10531060

1061+
/// That triggers stopping the transport of the current track without dispatching
1062+
/// to common routines like TVirtualMCApplication::PostTrack() etc.
1063+
virtual void InterruptTrack()
1064+
{
1065+
Info("InterruptTrack", "Not implemented");
1066+
}
1067+
10541068
/// Process one run and return true if run has finished successfully,
10551069
/// return false in other cases (run aborted by user)
10561070
virtual Bool_t ProcessRun(Int_t nevent) override;

0 commit comments

Comments
 (0)