Skip to content
Snippets Groups Projects

Feat&fix: (FastCCD CORRECTION) add bools to control correction steps

Merged Feat&fix: (FastCCD CORRECTION) add bools to control correction steps
feat/split_fccd_corr into master
Merged Karim Ahmed requested to merge feat/split_fccd_corr into master

@cascella This is the version of the notebook that might be useful to review and understand

FYI: @karnem @setoodeh

Edited by Karim Ahmed

Merge request reports

Approval is optional

Merged by Karim AhmedKarim Ahmed 5 years ago (Jan 28, 2020 4:31pm UTC)

Merge details

  • Changes merged into master with b5462e5c.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
458 " condition = Conditions.Illuminated.CCD(bias_voltage=bias_voltage,\n",
459 " integration_time=integration_time,\n",
460 " gain_setting=det_gain,\n",
461 " temperature=temperature_k,\n",
462 " pixels_x=x, pixels_y=y,\n",
463 " photon_energy=photon_energy_gain_map)\n",
464 "\n",
465 " relgain, relgain_time = get_constant_from_db_and_time(device=Detectors.fastCCD1,\n",
466 " constant=relgain,\n",
467 " condition=condition,\n",
468 " empty_constant=None,\n",
469 " cal_db_interface=cal_db_interface, \n",
470 " creation_time=creation_time,\n",
471 " timeout=cal_db_timeout, print_once=False)\n",
472 "\n",
473 " # TODO: CHECK IF THIS FLIPPING IS CORRECT\n",
  • Karim Ahmed
    Karim Ahmed @ahmedk started a thread on the diff
    • notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
    735 753 "offsetMap = np.squeeze(offsetMap)\n",
    736 754 "noiseMap = np.squeeze(noiseMap)\n",
    737 755 "badPixelMap = np.squeeze(badPixelMap)\n",
    738 "relGain = np.squeeze(relGain)\n",
    756 "if corr_bools.get('relgain'):\n",
    757 " #TODO: This should be removed after properly injecting gain const for all 3 gains\n",
    • Karim Ahmed
      Karim Ahmed @ahmedk ·
      Author Owner

      This is a temporary solution for the gain constant in database for only high gain, which it should not be the case normally (gain constant should have the 3 gains as before)

    • Please register or sign in to reply
  • Karim Ahmed
    Karim Ahmed @ahmedk ·
    Author Owner

    @cascella @setoodeh I have applied some changes regards to our meeting 2 weeks ago. please test and review this notebook for merging the changes to the master if it is ok.

    There are two parts which are not updated yet. mainly checking if the relgain flipping is correct or not.

    I have pointed to these points in the discussion for these MR.

  • Kiana Setoodehnia
    Kiana Setoodehnia @setoodeh ·
    Contributor

    Hi Karim,

    Thank you so very much for your time. I appreciate it. Unfortunately, I cannot test this notebook now because I have a few more urgent issues to take care of and tomorrow is my last day of work in 2019. I will come back to this notebook next year. Sorry about this.

    Best, Kiana

  • Karim Ahmed
    Karim Ahmed @ahmedk ·
    Author Owner

    @setoodeh @cascella This notebook should have all of the changes we discussed in our last meeting except the part for checking if the gain flipping in the notebook is correct or not.

  • Karim Ahmed added 1 commit

    added 1 commit

    • 03244729 - add path inset to balance sequences

    Compare with previous version

  • Kiana Setoodehnia
    Kiana Setoodehnia @setoodeh ·
    Contributor

    Dear Karim,

    The runs I have problem running the correction notebook with are runs 448 and 453 in folder: /gpfs/exfel/exp/SCS/201930/p900074/raw

    Thanks a lot for taking a look at the issue. I appreciate it. Cheers, Kiana

  • Mikhail Karnevskiy added 1 commit

    added 1 commit

    • 8c8aae1f - Check if Relgain constant exists

    Compare with previous version

  • Mikhail Karnevskiy
    Mikhail Karnevskiy @karnem ·
    Contributor

    @setoodeh

    I introduced a check for presence of relative gain constants. They are not available for some runs. Now correction for runs 448 and 353 works (FastCCDDataCorrection.pdf, FastCCDDataCorrection.pdf).

    @ahmedk

    Version of the notebook from master does not work due to outdated common-code correction. I would suggest to proceed with this version to have at working version in production.

    Present changes in the MR fixes common mode correction (FastCCDDataCorrection.pdf).

    Edited by Mikhail Karnevskiy
  • Mikhail Karnevskiy changed title from (FastCCD CORRECTION) add bools to control correction steps to Fix: (FastCCD CORRECTION) add bools to control correction steps

    changed title from (FastCCD CORRECTION) add bools to control correction steps to Fix: (FastCCD CORRECTION) add bools to control correction steps

  • Kiana Setoodehnia
    Kiana Setoodehnia @setoodeh ·
    Contributor

    Thanks very much.

  • Karim Ahmed
    Karim Ahmed @ahmedk ·
    Author Owner

    So what is the state of this Notebook after the last fix for the relative gain retrieval? @setoodeh Should we merge this notebook?

  • Kiana Setoodehnia
    Kiana Setoodehnia @setoodeh ·
    Contributor

    Hi Karim,

    Yes, please. Sorry, I meant to tell you guys and then I went to work in the cleanroom and didn't respond. Thank you both very much. Best, Kiana

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
    • Please register or sign in to reply

    Legal Notice | Contacts