diff --git a/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp b/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp index cf11dbc41db33a192785318fd163df40d1dec3b2..0eaf771804f66a18000fa570e103dab04a0ebd65 100644 --- a/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp +++ b/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp @@ -29,7 +29,7 @@ DepthprobeInstrumentEditor::DepthprobeInstrumentEditor(QWidget* parent, auto* layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); - auto* scanEditor = new ScanEditor(this, instrument->scanItem(), &m_ec, false); + auto* scanEditor = new ScanEditor(this, instrument->scanItem(), &m_ec, false, false); layout->addWidget(scanEditor); auto* depthAxisEditor = new AxisPropertyForm(this, "Depth axis", &instrument->zAxis(), diff --git a/GUI/View/Instrument/OffspecInstrumentEditor.cpp b/GUI/View/Instrument/OffspecInstrumentEditor.cpp index 5259d72a055db744efcbf10c8f96ab36737dd418..77ad00d055872b5ee0c3cea848546d35fd2e0c20 100644 --- a/GUI/View/Instrument/OffspecInstrumentEditor.cpp +++ b/GUI/View/Instrument/OffspecInstrumentEditor.cpp @@ -29,7 +29,7 @@ OffspecInstrumentEditor::OffspecInstrumentEditor(QWidget* parent, OffspecInstrum auto* layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); - auto* scanEditor = new ScanEditor(this, instrument->scanItem(), &m_ec, false); + auto* scanEditor = new ScanEditor(this, instrument->scanItem(), &m_ec, true, false); layout->addWidget(scanEditor); auto* detectorEditor = new OffspecDetectorEditor(this, instrument); diff --git a/GUI/View/Instrument/ScanEditor.cpp b/GUI/View/Instrument/ScanEditor.cpp index cba5bec3cbe4e78caa85f329b532c481f23a2136..93d2cd4ae2757f2844ff51829183ba82290a58d3 100644 --- a/GUI/View/Instrument/ScanEditor.cpp +++ b/GUI/View/Instrument/ScanEditor.cpp @@ -24,7 +24,8 @@ #include <QFormLayout> #include <QLineEdit> -ScanEditor::ScanEditor(QWidget* parent, ScanItem* item, InstrumentNotifier* ec, bool allow_distr) +ScanEditor::ScanEditor(QWidget* parent, ScanItem* item, InstrumentNotifier* ec, + bool allow_footprint, bool allow_distr) : CollapsibleGroupBox("Beam and scan parameters", parent, item->expandBeamParameters) { auto* layout = new QVBoxLayout; @@ -44,6 +45,7 @@ ScanEditor::ScanEditor(QWidget* parent, ScanItem* item, InstrumentNotifier* ec, validator->setRange(0.0, 1e32, 1000); auto* hLayout = new QHBoxLayout; + hLayout->setAlignment(Qt::AlignLeft); layout->addLayout(hLayout); auto* wavelengthEditor = new DistributionEditor("Wavelength (nm)", MeanConfig{true}, @@ -54,8 +56,11 @@ ScanEditor::ScanEditor(QWidget* parent, ScanItem* item, InstrumentNotifier* ec, auto* inclinationEditor = new AlphaScanEditor(this, item->grazingScanItem(), allow_distr); hLayout->addWidget(inclinationEditor); - auto* footprintEditor = new FootprintForm(this, item); - hLayout->addWidget(footprintEditor); + if (allow_footprint) { + auto* footprintEditor = new FootprintForm(this, item); + hLayout->addWidget(footprintEditor); + connect(footprintEditor, &FootprintForm::dataChanged, this, &ScanEditor::dataChanged); + } intensityLineEdit->setText(QString::number(item->intensity())); @@ -73,7 +78,6 @@ ScanEditor::ScanEditor(QWidget* parent, ScanItem* item, InstrumentNotifier* ec, connect(inclinationEditor, &AlphaScanEditor::dataChanged, wavelengthEditor, &DistributionEditor::updateData); - connect(footprintEditor, &FootprintForm::dataChanged, this, &ScanEditor::dataChanged); // validate value while typing connect(intensityLineEdit, &QLineEdit::textEdited, [this, intensityLineEdit, item]() { diff --git a/GUI/View/Instrument/ScanEditor.h b/GUI/View/Instrument/ScanEditor.h index 976fe909ca43e4597faab4f94702e95e6fd0e32c..e1db882099875a50edc6fa9feefced81b76e29b4 100644 --- a/GUI/View/Instrument/ScanEditor.h +++ b/GUI/View/Instrument/ScanEditor.h @@ -25,7 +25,8 @@ class ScanItem; class ScanEditor : public CollapsibleGroupBox { Q_OBJECT public: - ScanEditor(QWidget* parent, ScanItem* item, InstrumentNotifier* ec, bool allow_distr = true); + ScanEditor(QWidget* parent, ScanItem* item, InstrumentNotifier* ec, bool allow_footprint, + bool allow_distr); signals: void dataChanged(); diff --git a/GUI/View/Instrument/SpecularInstrumentEditor.cpp b/GUI/View/Instrument/SpecularInstrumentEditor.cpp index 018c1dc518661c3f76db47f8a14ad7e6fb3a5474..23d26f89f9b1b21ab7c6aa83d37cb1e4fc8b0d1b 100644 --- a/GUI/View/Instrument/SpecularInstrumentEditor.cpp +++ b/GUI/View/Instrument/SpecularInstrumentEditor.cpp @@ -29,7 +29,7 @@ SpecularInstrumentEditor::SpecularInstrumentEditor(QWidget* parent, auto* layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); - auto* scanEditor = new ScanEditor(this, instrument->scanItem(), &m_ec); + auto* scanEditor = new ScanEditor(this, instrument->scanItem(), &m_ec, true, true); layout->addWidget(scanEditor); auto* polMatricesAnalysisEditor = new PolarizationAnalysisEditor(this, instrument); diff --git a/Sim/Simulation/DepthprobeSimulation.cpp b/Sim/Simulation/DepthprobeSimulation.cpp index ef8ef48d0d30d57eced92f5201e5def2fc5a3d34..19c310ebe7e5b9d4722591af312a13796873bd80 100644 --- a/Sim/Simulation/DepthprobeSimulation.cpp +++ b/Sim/Simulation/DepthprobeSimulation.cpp @@ -147,10 +147,7 @@ void DepthprobeSimulation::runComputation(const ReSample& re_sample, size_t i, d } } - const double alpha_i = result_angle; double intensity_factor = m_scan->intensityAt(i); - if (const auto* footprint = m_scan->footprintAt(i)) - intensity_factor *= footprint->calculate(alpha_i); for (double& v : intensities) v *= intensity_factor; diff --git a/Tests/ReferenceData/MiniExamples/varia/Resonator.int b/Tests/ReferenceData/MiniExamples/varia/Resonator.int index 55048d486e1417e9e30d92dc16e34212a97cc534..b673b49a10bbe158a988c0254a731722e24c4e90 100644 --- a/Tests/ReferenceData/MiniExamples/varia/Resonator.int +++ b/Tests/ReferenceData/MiniExamples/varia/Resonator.int @@ -7,30 +7,30 @@ ListScan("alpha_i (rad)", [0,0.000447520321024187,0.000895040642048374,0.0013425 EquiDivision("z (nm)", 20, -100, 100) # data -2.140811937796e-08 9.278111840233e-08 4.021061773183e-07 1.742697237898e-06 7.280156762702e-06 1.281519169883e-05 2.123571207089e-05 6.769290181888e-05 2.713544383080e-04 6.977819576685e-04 6.575114775039e-04 5.364340664596e-04 4.272606500423e-04 3.301780065956e-04 2.453522871874e-04 1.729286229152e-04 1.130307819730e-04 6.576087745838e-05 3.119912675457e-05 9.403663172467e-06 -6.046875083979e-07 2.616898949687e-06 1.132513304001e-05 4.901173488889e-05 2.044525952962e-04 3.592090086586e-04 5.933833369538e-04 1.886530585490e-03 7.548123778849e-03 1.937573051791e-02 1.819891403553e-02 1.475644449732e-02 1.163621935085e-02 8.856788598719e-03 6.434682779094e-03 4.384292412282e-03 2.717763157252e-03 1.444907566042e-03 5.731341815222e-04 1.073945745442e-04 -2.989528452866e-06 1.289620784768e-05 5.563174117823e-05 2.399852647650e-04 9.978801413391e-04 1.745737940468e-03 2.863765529423e-03 9.050938163050e-03 3.606087335380e-02 9.220369834422e-02 8.598290257163e-02 6.875921368010e-02 5.300258235802e-02 3.895515148476e-02 2.683275758372e-02 1.682125758379e-02 9.073372529835e-03 3.706106710389e-03 7.987897861901e-04 3.917776735246e-04 -7.379552752808e-06 3.166379098028e-05 1.358621890965e-04 5.829578209529e-04 2.411021419176e-03 4.188047709123e-03 6.790506892906e-03 2.124928279779e-02 8.406582652288e-02 2.135413442492e-01 1.967527377240e-01 1.537022052502e-01 1.139416077720e-01 7.870122740347e-02 4.907026598893e-02 2.596125927953e-02 1.008036970272e-02 1.904575080647e-03 1.666528521751e-03 9.347594979846e-03 -1.351409622051e-05 5.754690382997e-05 2.450540894493e-04 1.043534900470e-03 4.283199116079e-03 7.365358918703e-03 1.174502921725e-02 3.623397612542e-02 1.419087634403e-01 3.571227814583e-01 3.234449129748e-01 2.442598079977e-01 1.708313007394e-01 1.070352497201e-01 5.623188396685e-02 2.108276694203e-02 3.406593995477e-03 4.081888338015e-03 2.300196893901e-02 5.908456640122e-02 -2.156593863073e-05 9.093175479342e-05 3.834164405856e-04 1.616716367688e-03 6.570544107557e-03 1.115110915058e-02 1.739781003728e-02 5.267489126320e-02 2.035811819457e-01 5.061134386656e-01 4.481744963810e-01 3.234525626286e-01 2.085546743436e-01 1.127655890941e-01 4.380124291211e-02 7.173285282817e-03 5.738732409332e-03 3.947232878662e-02 1.054801296764e-01 1.982522041688e-01 -3.226655492305e-05 1.344014055951e-04 5.598435168243e-04 2.332067497891e-03 9.362791833854e-03 1.563357428099e-02 2.373492937097e-02 7.018345815630e-02 2.667794737563e-01 6.532410630051e-01 5.623969642526e-01 3.829486833127e-01 2.210701680853e-01 9.535935535251e-02 2.019580598121e-02 4.070037641320e-03 4.860954738830e-02 1.484149421198e-01 2.917225376834e-01 4.618111257166e-01 -4.697128486170e-05 1.928213367877e-04 7.915783110403e-04 3.249741496027e-03 1.285808103764e-02 2.105570440134e-02 3.092740630465e-02 8.884479639293e-02 3.309523878293e-01 7.956855046279e-01 6.620243133699e-01 4.190598049635e-01 2.081946838773e-01 6.208788063612e-02 3.233357331739e-03 4.045705210591e-02 1.675792774276e-01 3.644473922264e-01 6.001649888443e-01 8.379947020173e-01 -6.794440744802e-05 2.742101119863e-04 1.106712509874e-03 4.466915678645e-03 1.737532455376e-02 2.781116140051e-02 3.927686262874e-02 1.089728271200e-01 3.962296407777e-01 9.322505608291e-01 7.447395144620e-01 4.305855572519e-01 1.738127361070e-01 2.593662020573e-02 1.636720973711e-02 1.465085655598e-01 3.895788263403e-01 6.961661490807e-01 1.004358818436e+00 1.252355305452e+00 -9.899704439722e-05 3.917911430356e-04 1.550654784094e-03 6.137672771890e-03 2.341108585761e-02 3.649941337226e-02 4.922672482784e-02 1.310346616124e-01 4.629974687671e-01 1.062202067975e+00 8.089180164537e-01 4.180055565690e-01 1.250778910058e-01 3.934849436967e-03 8.463901157892e-02 3.460056694281e-01 7.211933633587e-01 1.114911816899e+00 1.427788024852e+00 1.581618246745e+00 -1.467709119382e-04 5.680947664199e-04 2.199061956713e-03 8.513144185445e-03 3.175746595668e-02 4.804979748308e-02 6.142443351730e-02 1.556610775535e-01 5.317535604253e-01 1.184804201023e+00 8.532268278305e-01 3.832340195277e-01 7.194243475266e-02 1.540860306536e-02 2.302928364721e-01 6.489343119046e-01 1.140766905381e+00 1.553262211553e+00 1.759491554342e+00 1.697395467415e+00 -2.233783309391e-04 8.432468087248e-04 3.183563120884e-03 1.202035441713e-02 4.373162436612e-02 6.396235489702e-02 7.684901173927e-02 1.837159419925e-01 6.030729723950e-01 1.299093816972e+00 8.764630562236e-01 3.295780496399e-01 2.672669634984e-02 8.001730077141e-02 4.683726218898e-01 1.045874249159e+00 1.596831921503e+00 1.916703538321e+00 1.888371980369e+00 1.525207289071e+00 -3.521471287441e-04 1.292645157117e-03 4.745593679118e-03 1.742439773941e-02 6.164073402171e-02 8.678720513502e-02 9.705841528374e-02 2.164396061035e-01 6.776246475915e-01 1.403691805651e+00 8.774490370481e-01 2.617753046025e-01 3.657596876568e-03 2.156448809969e-01 8.028095623256e-01 1.505402249358e+00 2.014187469448e+00 2.107058854512e+00 1.746354915523e+00 1.094080629939e+00 -5.810997120486e-04 2.067573935197e-03 7.357675031921e-03 2.618721098115e-02 8.979373731781e-02 1.211466380972e-01 1.246952623359e-01 2.557306441600e-01 7.562255077800e-01 1.496523360759e+00 8.548862779510e-01 1.861002546674e-01 1.843255689569e-02 4.363238698665e-01 1.223511344072e+00 1.975290801405e+00 2.307236543494e+00 2.052397720685e+00 1.345500222433e+00 5.515692196231e-01 -1.017772392043e-03 3.497906650533e-03 1.202404939110e-02 4.134073375293e-02 1.369229575695e-01 1.761308742889e-01 1.646190376825e-01 3.047386734214e-01 8.399476617871e-01 1.574267417151e+00 8.070634180515e-01 1.106285566529e-01 8.800934465808e-02 7.504389348189e-01 1.704801572346e+00 2.387545353770e+00 2.398353558438e+00 1.735484722670e+00 7.940647671391e-01 1.299654573680e-01 -1.931317483900e-03 6.386855967098e-03 2.112637281866e-02 6.989836288957e-02 2.227612133848e-01 2.716690868513e-01 2.267748732728e-01 3.692619417982e-01 9.303316613365e-01 1.631099578416e+00 7.312089140789e-01 4.597280654828e-02 2.311540192702e-01 1.159528192835e+00 2.205124848469e+00 2.666266252857e+00 2.237531431673e+00 1.212465022879e+00 2.822122897470e-01 6.847468156611e-02 -4.109811112337e-03 1.302033425247e-02 4.126208054425e-02 1.308002818324e-01 3.993506516897e-01 4.587308160250e-01 3.348317098579e-01 4.616136616742e-01 1.029836557668e+00 1.655354446694e+00 6.219497999506e-01 7.612638511116e-03 4.713614191597e-01 1.658112285186e+00 2.666698821838e+00 2.735538489029e+00 1.818834848591e+00 6.165144428738e-01 3.880081920732e-02 5.157870356341e-01 -1.049911099040e-02 3.169551108379e-02 9.572028538772e-02 2.891818467048e-01 8.413623381278e-01 9.030286995913e-01 5.599607939475e-01 6.141944854918e-01 1.142744184709e+00 1.618561130595e+00 4.674302523862e-01 2.499807559349e-02 8.483580855568e-01 2.234840303916e+00 3.008614029108e+00 2.519588844095e+00 1.190473502317e+00 1.508962697370e-01 2.757071853704e-01 1.447566376956e+00 -3.850499471705e-02 1.099061480304e-01 3.138613042118e-01 8.967353835411e-01 2.467162368490e+00 2.445431801731e+00 1.230926762018e+00 9.509750216075e-01 1.273660550037e+00 1.424988333988e+00 2.442120612571e-01 1.953771010277e-01 1.471118553258e+00 2.864882987469e+00 3.069095780442e+00 1.903626188534e+00 4.741158359097e-01 1.216066523122e-01 1.162742974577e+00 2.605660887248e+00 -3.065701457403e-01 8.212129476328e-01 2.200824936069e+00 5.900928684843e+00 1.523198901513e+01 1.376755178739e+01 5.275890531479e+00 2.186834979030e+00 1.247015073289e+00 7.593831330022e-01 3.059118338365e-01 1.197724642339e+00 2.571703014780e+00 3.018455359660e+00 2.104094197154e+00 7.899284534854e-01 4.213089135450e-01 1.349714369521e+00 2.599938709345e+00 2.894822452154e+00 -8.049961935539e-01 2.074810657548e+00 5.349717292314e+00 1.379906132684e+01 3.425828654043e+01 2.924327326060e+01 9.259250237782e+00 2.008804625980e+00 4.574641602246e-01 2.025944229792e+00 2.458557233992e+00 1.815878308426e+00 1.156634214312e+00 1.235704809975e+00 1.922611015270e+00 2.396988340721e+00 2.126073206591e+00 1.461836053973e+00 1.189888900356e+00 1.602119340571e+00 -2.276632042997e-01 5.514699409398e-01 1.337097183600e+00 3.244987588388e+00 7.582347272533e+00 5.921791204377e+00 1.349120280519e+00 7.792131480790e-02 1.019959518782e+00 2.981284697990e+00 1.467659615422e+00 1.101729330139e-01 9.493900961140e-01 2.921059421394e+00 3.574557702145e+00 2.121545782829e+00 3.872944258208e-01 5.163168266288e-01 2.318213357513e+00 3.541532222206e+00 -1.003800105482e-01 2.220329860226e-01 4.917166917273e-01 1.090275144532e+00 2.327367448104e+00 1.586299231849e+00 1.887793662099e-01 1.308767201610e-01 1.363876221819e+00 2.737755583245e+00 7.898886546450e-01 1.101058585588e-01 1.921923085185e+00 3.778082799134e+00 3.187507174607e+00 9.615097337374e-01 9.878801018363e-02 1.742227846990e+00 3.663844372987e+00 3.287634888437e+00 -7.692223861846e-02 1.538860619885e-01 3.083823529334e-01 6.190355197998e-01 1.196447787626e+00 6.995650472485e-01 2.766965262123e-02 2.651290843642e-01 1.526062405945e+00 2.533876918286e+00 4.745653260398e-01 3.489577253495e-01 2.614047718397e+00 3.975059393701e+00 2.464933458312e+00 2.895692670666e-01 6.031086629828e-01 2.930958178346e+00 3.887526023008e+00 2.104052317281e+00 +7.974481915518e-07 3.456532845014e-06 1.498231581686e-05 6.494074338575e-05 2.713272065314e-04 4.776982706630e-04 7.918068857625e-04 2.524646943304e-03 1.012207326936e-02 2.603288846805e-02 2.453771402530e-02 2.003053706973e-02 1.596860731012e-02 1.235730568332e-02 9.201418096192e-03 6.505125575404e-03 4.271995664457e-03 2.504975090583e-03 1.206383720740e-03 3.779098225601e-04 +1.094491120186e-05 4.737813961896e-05 2.050898374115e-04 8.877908286419e-04 3.704361031064e-03 6.510492579660e-03 1.076069371277e-02 3.422717197639e-02 1.369905045127e-01 3.517581449330e-01 3.305809662373e-01 2.683411021701e-01 2.119767798869e-01 1.617813117040e-01 1.180160301613e-01 8.090855258534e-02 5.065127107344e-02 2.740007982497e-02 1.127334984131e-02 2.351159028491e-03 +3.171633136957e-05 1.368586220449e-04 5.905581163763e-04 2.548322475163e-03 1.059933016081e-02 1.855033752762e-02 3.045039852057e-02 9.629185804329e-02 3.837987092036e-01 9.816917207668e-01 9.160752777257e-01 7.335255744392e-01 5.666502212294e-01 4.178681760720e-01 2.893358245701e-01 1.829120365703e-01 1.001281085691e-01 4.216312590642e-02 9.825180346698e-03 3.538771912676e-03 +5.389909685492e-05 2.313401715666e-04 9.929409305018e-04 4.261853979068e-03 1.763191827368e-02 3.064023256867e-02 4.971435473076e-02 1.556607583177e-01 6.160781110585e-01 1.565548939609e+00 1.443493238430e+00 1.129222005287e+00 8.390830414836e-01 5.817897832855e-01 3.650608242566e-01 1.953744981167e-01 7.776363550903e-02 1.565735114042e-02 1.077510598447e-02 6.307649496814e-02 +7.472903407753e-05 3.183201765340e-04 1.355950904627e-03 5.776020937571e-03 2.371538938885e-02 4.079831865883e-02 6.510447635447e-02 2.009727377603e-01 7.874403970919e-01 1.982435398274e+00 1.796804127449e+00 1.358899236833e+00 9.528276882577e-01 5.996494861612e-01 3.176425464847e-01 1.213235033758e-01 2.067418218302e-02 2.061632555439e-02 1.207631284461e-01 3.154605058950e-01 +9.572563117982e-05 4.037544257760e-04 1.702998507940e-03 7.183219641765e-03 2.920309438838e-02 4.958324396809e-02 7.741541364128e-02 2.345358365167e-01 9.068502965813e-01 2.255393844133e+00 1.998704568877e+00 1.444700941597e+00 9.341404505456e-01 5.078099221070e-01 1.996590877141e-01 3.403532420526e-02 2.371611013907e-02 1.689016897985e-01 4.572490343256e-01 8.649401271497e-01 +1.195172225521e-04 4.979953284528e-04 2.075064675365e-03 8.646683984504e-03 3.472624155300e-02 5.800997797891e-02 8.813658823339e-02 2.607864352905e-01 9.917462894819e-01 2.429415313343e+00 2.093180467717e+00 1.427604685826e+00 8.267645374826e-01 3.591372335258e-01 7.778536030960e-02 1.423991480208e-02 1.749111078300e-01 5.404417563624e-01 1.068068159328e+00 1.696696993534e+00 +1.492192111689e-04 6.127632406487e-04 2.516383196689e-03 1.033420187635e-02 4.090251203698e-02 6.700981435816e-02 9.850200386718e-02 2.831565433394e-01 1.055272695164e+00 2.538194142225e+00 2.113501959227e+00 1.340160399693e+00 6.682995605199e-01 2.013639767317e-01 1.081835587698e-02 1.250823924816e-01 5.252465023381e-01 1.148221105794e+00 1.896791421447e+00 2.654958221955e+00 +1.889138384720e-04 7.626772222132e-04 3.079210232446e-03 1.243252802753e-02 4.837625638375e-02 7.746694675994e-02 1.094908380002e-01 3.039946560139e-01 1.105878809275e+00 2.603049403584e+00 2.081188946324e+00 1.205541237968e+00 4.888734760468e-01 7.431927316323e-02 4.395763294318e-02 4.024185033535e-01 1.076238371163e+00 1.929038380295e+00 2.789363930931e+00 3.485454714048e+00 +2.446871630661e-04 9.687083369876e-04 3.835332065007e-03 1.518591482401e-02 5.794402297931e-02 9.038047148099e-02 1.219961848015e-01 3.249790548633e-01 1.148870663642e+00 2.636908456551e+00 2.009854670563e+00 1.040741048361e+00 3.133062939668e-01 1.016700709773e-02 2.062922590872e-01 8.503386438161e-01 1.778162784970e+00 2.754936151677e+00 3.534985028264e+00 3.924004132794e+00 +3.264788339492e-04 1.264118686178e-03 4.895042985569e-03 1.895662288153e-02 7.074068233708e-02 1.070830769307e-01 1.370069596067e-01 3.474777711885e-01 1.187665948691e+00 2.647486636004e+00 1.908282286276e+00 8.591316628226e-01 1.627264666285e-01 3.334264842512e-02 5.090450787037e-01 1.440452693800e+00 2.537893961023e+00 3.461989541065e+00 3.929182583601e+00 3.799222778287e+00 +4.516593688347e-04 1.705609814654e-03 6.441594755284e-03 2.433056058908e-02 8.854944730703e-02 1.295762860242e-01 1.558226243189e-01 3.728312750025e-01 1.224588398051e+00 2.639212716779e+00 1.782306346425e+00 6.720357997562e-01 5.538286821601e-02 1.600809444603e-01 9.447347944313e-01 2.115199787242e+00 3.235338836587e+00 3.890268881085e+00 3.840720052830e+00 3.110820661958e+00 +6.525584103579e-04 2.396255018369e-03 8.800405629070e-03 3.232423791450e-02 1.143924093429e-01 1.611394093967e-01 1.803821783035e-01 4.026304514331e-01 1.261357177364e+00 2.614256123447e+00 1.635854422723e+00 4.896568194380e-01 6.988960949617e-03 3.979041968827e-01 1.487665360606e+00 2.795121095761e+00 3.745938016059e+00 3.925839755714e+00 3.261776099761e+00 2.051503563547e+00 +9.937076899958e-04 3.536971813180e-03 1.259138974253e-02 4.483165555285e-02 1.537816672394e-01 2.075837837049e-01 2.138824563821e-01 4.391024080723e-01 1.299413602230e+00 2.572921631736e+00 1.471434869870e+00 3.216938534244e-01 3.094778940183e-02 7.454000544797e-01 2.095911436593e+00 3.389313172143e+00 3.965310114465e+00 3.534632097938e+00 2.324715451816e+00 9.593428473900e-01 +1.615459484781e-03 5.554194031219e-03 1.909989442920e-02 6.569400349690e-02 2.176665504406e-01 2.801448743967e-01 2.621239466790e-01 4.858239631389e-01 1.340191569295e+00 2.513443871939e+00 1.290182349631e+00 1.779421508408e-01 1.388363450125e-01 1.192538216339e+00 2.714612255341e+00 3.807547936241e+00 3.831412971690e+00 2.779536973302e+00 1.278092231994e+00 2.123981142767e-01 +2.859408580771e-03 9.459823178852e-03 3.130359001999e-02 1.036118611344e-01 3.303359764986e-01 4.030865725176e-01 3.368832481165e-01 5.493391775273e-01 1.385436590959e+00 2.430818511449e+00 1.091358375241e+00 6.934855101818e-02 3.418156309212e-01 1.721748575891e+00 3.279844821686e+00 3.971780029729e+00 3.339786777656e+00 1.816138885783e+00 4.269211494249e-01 9.947208635550e-02 +5.699154507838e-03 1.806307073642e-02 5.726660283270e-02 1.816100118648e-01 5.547111759677e-01 6.375657819253e-01 4.659970508743e-01 6.435861621210e-01 1.437733947229e+00 2.313190970232e+00 8.707986812833e-01 1.087521462040e-02 6.547961909639e-01 2.310027704597e+00 3.721003114525e+00 3.823423375508e+00 2.548641454161e+00 8.689921063202e-01 5.473697252529e-02 7.115405772585e-01 +1.368021928825e-02 4.131709250668e-02 1.248324339988e-01 3.772992365889e-01 1.098221851183e+00 1.179453777631e+00 7.325176624758e-01 8.053727998479e-01 1.501447236076e+00 2.129601923325e+00 6.168509894176e-01 3.214697235794e-02 1.110297339682e+00 2.932041498461e+00 3.953860954011e+00 3.318020212960e+00 1.573731920558e+00 2.021296935656e-01 3.564675998170e-01 1.890888392662e+00 +4.720379166047e-02 1.348008895767e-01 3.851408970176e-01 1.100924077968e+00 3.030420205439e+00 3.005835278284e+00 1.515947712492e+00 1.175477627661e+00 1.580480206448e+00 1.773461902455e+00 3.059950047679e-01 2.391565138321e-01 1.818568444902e+00 3.551699832910e+00 3.813868344158e+00 2.373438089987e+00 5.958328786973e-01 1.473742391534e-01 1.431099132612e+00 3.224898009086e+00 +3.546094091399e-01 9.502726049133e-01 2.547717732028e+00 6.833778946621e+00 1.764712377237e+01 1.596003075838e+01 6.127820492785e+00 2.553984606340e+00 1.471487218850e+00 9.003907545462e-01 3.501835127905e-01 1.390899133247e+00 3.017002489540e+00 3.561029735133e+00 2.493586637757e+00 9.366201866364e-01 4.836104388317e-01 1.567929128470e+00 3.050825191922e+00 3.417771208152e+00 +9.029574109376e-01 2.327970695532e+00 6.004192285887e+00 1.549163213757e+01 3.847129210115e+01 3.285318235594e+01 1.041711142734e+01 2.272448375070e+00 5.123445064541e-01 2.241568293733e+00 2.740570682018e+00 2.047704017095e+00 1.314308935585e+00 1.380626919696e+00 2.126424674933e+00 2.659713897615e+00 2.380910774021e+00 1.655628298730e+00 1.342707514543e+00 1.779343092173e+00 +2.446126922176e-01 5.928889974774e-01 1.438395783515e+00 3.492937159367e+00 8.166633236965e+00 6.383814437307e+00 1.459629787213e+00 8.495177727794e-02 1.081531537137e+00 3.175257102570e+00 1.570980328257e+00 1.205413069246e-01 1.002222482042e+00 3.098050380791e+00 3.804405060093e+00 2.269358313306e+00 4.205431974566e-01 5.430033744647e-01 2.452518694198e+00 3.764168345477e+00 +1.024399338857e-01 2.267119464370e-01 5.023517096630e-01 1.114464178258e+00 2.380311752383e+00 1.623755725841e+00 1.941716092622e-01 1.323870204113e-01 1.386785327859e+00 2.787536278681e+00 8.063154831835e-01 1.110397794062e-01 1.951309175953e+00 3.842427625584e+00 3.247520140492e+00 9.837744676732e-01 9.947477028605e-02 1.765633354949e+00 3.724248349421e+00 3.350833160105e+00 +7.695181065731e-02 1.539506259343e-01 3.085233354350e-01 6.193434177848e-01 1.197094446324e+00 6.999941748290e-01 2.771192976332e-02 2.651751384346e-01 1.526504930403e+00 2.534740792122e+00 4.748002377601e-01 3.489958796553e-01 2.614687489864e+00 3.976283660994e+00 2.465933427468e+00 2.898407040875e-01 6.031345409293e-01 2.931553442183e+00 3.888733508052e+00 2.105085796276e+00 7.840085180490e-02 1.387315305843e-01 2.461700990828e-01 4.380071589312e-01 7.507846195290e-01 3.627306136643e-01 2.775447905880e-03 3.834883362820e-01 1.631621599362e+00 2.337282711074e+00 2.689266131705e-01 6.529139617537e-01 3.132901583528e+00 3.834642725615e+00 1.674129499219e+00 3.314324419058e-02 1.462079800752e+00 3.713386306384e+00 3.279014798962e+00 8.606102597109e-01 1.064492842137e-01 1.584943974231e-01 2.376996141374e-01 3.588859759411e-01 5.235422316123e-01 1.940659373215e-01 1.999056481547e-02 5.038815982343e-01 1.729795772908e+00 2.153563284126e+00 1.284307826019e-01 1.009571267231e+00 3.538102167236e+00 3.487711393765e+00 9.556925787622e-01 1.783614657662e-01 2.438723332636e+00 3.947822277838e+00 2.200004122658e+00 1.356554064999e-01 2.387976227143e-01 2.615662034726e-01 2.907528459829e-01 3.283944324704e-01 3.618049833258e-01 8.288805648526e-02 7.337382715752e-02 6.501119174922e-01 1.819731547416e+00 1.936207141092e+00 3.753839422808e-02 1.414569351091e+00 3.794620584277e+00 2.938574922896e+00 3.858522141336e-01 6.847312228528e-01 3.283876421876e+00 3.548767443674e+00 1.030147196618e+00 2.244388336042e-01 diff --git a/auto/Examples/varia/Resonator.py b/auto/Examples/varia/Resonator.py index 1ba02c9da3ed3a873f9a57a88750ce387fcdd795..7d9b50040fde97e4b85f65d96cd763fc292f094a 100755 --- a/auto/Examples/varia/Resonator.py +++ b/auto/Examples/varia/Resonator.py @@ -70,8 +70,6 @@ def get_simulation(sample): scan = ba.AlphaScan(na, ai_min, ai_max) scan.setWavelength(wl) - footprint = ba.FootprintSquare(0.01) - scan.setFootprint(footprint) z_axis = ba.EquiDivision("z (nm)", nz, z_min, z_max) simulation = ba.DepthprobeSimulation(scan, sample, z_axis)