Commit 9dc0af37 authored by Rafaella Eleni Kotitsa's avatar Rafaella Eleni Kotitsa Committed by Simon Spannagel
Browse files

remove gain_smearing

parent 1e913f18

src/modules/DefaultDigitizer/DefaultDigitizerModule.cpp

+0 −11
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ DefaultDigitizerModule::DefaultDigitizerModule(Configuration& config, 
    // Set defaults for config variables

    config_.setDefault<int>("electronics_noise", Units::get(110, "e"));

    config_.setDefault<double>("gain", 1.0);

    config_.setDefault<double>("gain_smearing", 0.0);



    config_.setDefault<int>("threshold", Units::get(600, "e"));

    config_.setDefault<int>("threshold_smearing", Units::get(30, "e"));
@@ -75,7 +74,6 @@ DefaultDigitizerModule::DefaultDigitizerModule(Configuration& config, 


    electronics_noise_ = config_.get<unsigned int>("electronics_noise");

    gain_ = config_.get<double>("gain");

    gain_smearing_ = config_.get<double>("gain_smearing");



    if(config_.has("gain_function")) {

        gain_function_ = std::make_unique<TFormula>("gain_function", (config_.get<std::string>("gain_function")).c_str());
@@ -153,7 +151,6 @@ void DefaultDigitizerModule::initialize() { 
        h_pxq = CreateHistogram<TH1D>("pixelcharge", "raw pixel charge;pixel charge [ke];pixels", nbins, 0, maximum);

        h_pxq_noise = CreateHistogram<TH1D>(

            "pixelcharge_noise", "pixel charge w/ el. noise;pixel charge [ke];pixels", nbins, 0, maximum);

        h_gain = CreateHistogram<TH1D>("gain", "applied gain; gain factor;events", 40, -20, 20);

        h_pxq_gain = CreateHistogram<TH1D>(

            "pixelcharge_gain", "pixel charge w/ gain applied;pixel charge [ke];pixels", nbins, 0, maximum);

        h_thr = CreateHistogram<TH1D>("threshold", "applied threshold; threshold [ke];events", maximum, 0, maximum / 10);
@@ -238,13 +235,6 @@ void DefaultDigitizerModule::run(Event* event) { 
            h_pxq_noise->Fill(charge / 1e3);

        }



        // Smear the gain factor, Gaussian distribution around "gain" with width "gain_smearing"

        allpix::normal_distribution<double> gain_smearing(gain_, gain_smearing_);

        double gain = gain_smearing(event->getRandomEngine());

        if(output_plots_) {

            h_gain->Fill(gain);

        }



        // Apply the gain to the charge:

        charge = gain_function_->Eval(charge);

        LOG(DEBUG) << "Charge after amplifier (gain): " << Units::display(charge, "e");
@@ -388,7 +378,6 @@ void DefaultDigitizerModule::finalize() { 
        // Charge plots

        h_pxq->Write();

        h_pxq_noise->Write();

        h_gain->Write();

        h_pxq_gain->Write();

        h_thr->Write();

        h_pxq_sat->Write();

src/modules/DefaultDigitizer/DefaultDigitizerModule.hpp

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ namespace allpix { 
        bool output_plots_{};



        unsigned int electronics_noise_{};

        double gain_{}, gain_smearing_{};

        double gain_{};

        std::unique_ptr<TFormula> gain_function_{};



        bool saturation_{};
@@ -103,7 +103,7 @@ namespace allpix { 
        std::atomic<unsigned long long> total_hits_{};



        // Output histograms

        Histogram<TH1D> h_pxq, h_pxq_noise, h_gain, h_pxq_gain, h_thr, h_pxq_thr, h_pxq_sat, h_pxq_adc_smear, h_pxq_adc,

        Histogram<TH1D> h_pxq, h_pxq_noise, h_pxq_gain, h_thr, h_pxq_thr, h_pxq_sat, h_pxq_adc_smear, h_pxq_adc,

            h_px_toa, h_px_tdc_smear, h_px_tdc;

        Histogram<TH2D> h_calibration, h_toa_calibration;

    };