← Back to branch summary

~christopher-hunt08/maus/maus_integrated_kalman

« back to all changes in this revision

Viewing changes to src/common_cpp/Simulation/MAUSSteppingAction.cc

  • Committer: Durga Rajaram
  • Date: 2014-10-06 20:45:37 UTC
  • mfrom: (697.24.7 trunk)
  • mto: (697.30.10 maus)
  • mto: This revision was merged to the branch mainline in revision 703.
  • Revision ID: durga@fnal.gov-20141006204537-1aokre71ss0b2vcv
merge from trunk; set part_event_number for extra emr events

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common_cpp/Simulation/MAUSSteppingAction.cc
112
112
    step["path_length"] = aTrack->GetTrackLength();
113
113
    step["energy_deposited"] = aStep->GetTotalEnergyDeposit();
114
114
    step["time"] = point->GetGlobalTime();
115
 
 
 
115
    // G4StepPoint GetPhysicalVolume is inlined
 
116
    // point->GetTouchable()->GetPhysicalVolume() with no NULL check so we do it
 
117
    // here
 
118
    if (point->GetTouchable() != NULL && point->GetPhysicalVolume() != NULL) {
 
119
        step["volume"] = point->GetPhysicalVolume()->GetName();
 
120
    } else {
 
121
        step["volume"] = "";
 
122
    }
 
123
    if (point->GetMaterial() != NULL) {
 
124
        step["material"] = point->GetMaterial()->GetName();
 
125
    } else {
 
126
        step["material"] = "";
 
127
    }
116
128
    return step;
117
129
}
118
130