Commit bd1535b7 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Stay consistent and count toal number of carriers, not of carrier pairs

parent 213b3848

src/modules/DepositionGeant4/SensitiveDetectorActionG4.cpp

+2 −1
Original line number Diff line number Diff line
@@ -188,7 +188,8 @@ void SensitiveDetectorActionG4::dispatchMessages(Module* module, Messenger* mess 
        auto global_end = detector_->getGlobalPosition(local_end);

        mc_particles.emplace_back(

            local_begin, global_begin, local_end, global_end, pdg_code, track_time_local, track_time_global);

        mc_particles.back().setTotalDepositedCharge(charge);

        // Count electrons and holes:

        mc_particles.back().setTotalDepositedCharge(2 * charge);

        mc_particles.back().setTrack(track_info_manager_->findMCTrack(track_id));

        id_to_particle_[track_id] = mc_particles.size() - 1;

src/modules/DepositionLaser/DepositionLaserModule.cpp

+2 −0
Original line number Diff line number Diff line
@@ -301,6 +301,8 @@ void DepositionLaserModule::run(Event* event) { 
                                                22, // gamma

                                                time_entry_local,

                                                time_entry_global);

        // Count electrons and holes:

        mc_particles[hit.detector].back().setTotalDepositedCharge(2);



        // allpix::DepositedCharge for electron

        deposited_charges[hit.detector].emplace_back(hit_local,

src/modules/DepositionPointCharge/DepositionPointChargeModule.cpp

+4 −2
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ void DepositionPointChargeModule::DepositPoint(Event* event, const ROOT::Math::X 
    mcparticles.emplace_back(position, position_global, position, position_global, -1, 0., 0.);

    LOG(DEBUG) << "Generated MCParticle at global position " << Units::display(position_global, {"um", "mm"})

               << " in detector " << detector_->getName();

    mcparticles.back().setTotalDepositedCharge(carriers_);

    // Count electrons and holes:

    mcparticles.back().setTotalDepositedCharge(2 * carriers_);



    charges.emplace_back(position, position_global, CarrierType::ELECTRON, carriers_, 0., 0., &(mcparticles.back()));

    charges.emplace_back(position, position_global, CarrierType::HOLE, carriers_, 0., 0., &(mcparticles.back()));
@@ -216,7 +217,8 @@ void DepositionPointChargeModule::DepositLine(Event* event, const ROOT::Math::XY 
    mcparticles.emplace_back(start_local, start_global, end_local, end_global, -1, 0., 0.);

    LOG(DEBUG) << "Generated MCParticle with start " << Units::display(start_global, {"um", "mm"}) << " and end "

               << Units::display(end_global, {"um", "mm"}) << " in detector " << detector_->getName();

    mcparticles.back().setTotalDepositedCharge(charge);

    // Count electrons and holes:

    mcparticles.back().setTotalDepositedCharge(2 * charge);



    // Deposit the charge carriers:

    auto position_local = start_local;

src/modules/DepositionReader/DepositionReaderModule.cpp

+2 −1
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ void DepositionReaderModule::run(Event* event) { 


            mc_particles.emplace_back(

                start_local, start_global, end_local, end_global, pdg_code, time - time_reference, time);

            mc_particles.back().setTotalDepositedCharge(mc_particle_charge[detector].at(i));

            // Count electrons and holes:

            mc_particles.back().setTotalDepositedCharge(2 * mc_particle_charge[detector].at(i));

        }



        for(size_t i = 0; i < mc_particle_size; i++) {