Skip to content
Snippets Groups Projects
Commit 9a646174 authored by Udo Eisenbarth's avatar Udo Eisenbarth :speech_balloon:
Browse files

Update all examples due to Dummy node changes.

parent 612de047
No related branches found
No related tags found
1 merge request!5Resolve "Implement "inverted" feature for group nodes"
Pipeline #7353 failed
Stage: test
    Stage: build
      Hide whitespace changes
      Inline Side-by-side
      examples/graph_port_test.rs
      + 4
      − 4
      View file @ 9a646174
      ...@@ -10,12 +10,12 @@ fn main() -> Result<(), OpossumError> { ...@@ -10,12 +10,12 @@ fn main() -> Result<(), OpossumError> {
      let mut scenery = OpticScenery::new(); let mut scenery = OpticScenery::new();
      scenery.set_description("Fancy Graph with Ports"); scenery.set_description("Fancy Graph with Ports");
      let in1 = scenery.add_node(OpticNode::new("Input", Dummy)); let in1 = scenery.add_node(OpticNode::new("Input", Dummy::default()));
      let out1 = scenery.add_node(OpticNode::new("Output", Dummy)); let out1 = scenery.add_node(OpticNode::new("Output", Dummy::default()));
      let bs1 = scenery.add_node(OpticNode::new("Beamsplitter 1", BeamSplitter::default())); let bs1 = scenery.add_node(OpticNode::new("Beamsplitter 1", BeamSplitter::default()));
      let bs2 = scenery.add_node(OpticNode::new("Beamsplitter 2", BeamSplitter::default())); let bs2 = scenery.add_node(OpticNode::new("Beamsplitter 2", BeamSplitter::default()));
      let m1 = scenery.add_node(OpticNode::new("Mirror 1", Dummy)); let m1 = scenery.add_node(OpticNode::new("Mirror 1", Dummy::default()));
      let m2 = scenery.add_node(OpticNode::new("Mirror 2", Dummy)); let m2 = scenery.add_node(OpticNode::new("Mirror 2", Dummy::default()));
      scenery.connect_nodes(in1, "rear", bs1, "input1")?; scenery.connect_nodes(in1, "rear", bs1, "input1")?;
      scenery.connect_nodes(bs1, "out1_trans1_refl2", m1, "front")?; scenery.connect_nodes(bs1, "out1_trans1_refl2", m1, "front")?;
      ......
      examples/group_reverse_example.rs
      + 1
      − 11
      View file @ 9a646174
      ...@@ -6,10 +6,9 @@ use opossum::{ ...@@ -6,10 +6,9 @@ use opossum::{
      lightdata::{DataEnergy, LightData}, lightdata::{DataEnergy, LightData},
      nodes::{Detector, Dummy, NodeGroup, Source}, nodes::{Detector, Dummy, NodeGroup, Source},
      optic_node::OpticNode, optic_node::OpticNode,
      spectrum::{create_he_ne_spectrum, Spectrum}, spectrum::create_he_ne_spectrum,
      OpticScenery, analyzer::AnalyzerEnergy, OpticScenery, analyzer::AnalyzerEnergy,
      }; };
      use uom::si::length::{Length, nanometer};
      fn main() -> Result<(), OpossumError> { fn main() -> Result<(), OpossumError> {
      let mut scenery = OpticScenery::new(); let mut scenery = OpticScenery::new();
      ...@@ -22,15 +21,6 @@ fn main() -> Result<(), OpossumError> { ...@@ -22,15 +21,6 @@ fn main() -> Result<(), OpossumError> {
      })), })),
      ); );
      // let i_s = scenery.add_element(
      // "Source",
      // Source::new(LightData::Energy(DataEnergy {
      // spectrum: Spectrum::new(
      // Length::new::<nanometer>(500.0)..Length::new::<nanometer>(503.0),
      // Length::new::<nanometer>(1.0)).unwrap()}),
      // ),
      // );
      let mut group = NodeGroup::new(); let mut group = NodeGroup::new();
      group.expand_view(true); group.expand_view(true);
      let g_n1 = group.add_node(OpticNode::new("A", Dummy::default())); let g_n1 = group.add_node(OpticNode::new("A", Dummy::default()));
      ......
      examples/group_test.rs
      + 5
      − 5
      View file @ 9a646174
      ...@@ -11,14 +11,14 @@ fn main() -> Result<(), OpossumError> { ...@@ -11,14 +11,14 @@ fn main() -> Result<(), OpossumError> {
      let mut group1 = NodeGroup::new(); let mut group1 = NodeGroup::new();
      group1.expand_view(true); group1.expand_view(true);
      let g1_n1 = group1.add_node(OpticNode::new("TFP1_g1", Dummy)); let g1_n1 = group1.add_node(OpticNode::new("TFP1_g1", Dummy::default()));
      let g1_n2 = group1.add_node(OpticNode::new("TFP2_g1", BeamSplitter::default())); let g1_n2 = group1.add_node(OpticNode::new("TFP2_g1", BeamSplitter::default()));
      group1.map_output_port(g1_n2, "out1_trans1_refl2", "out1")?; group1.map_output_port(g1_n2, "out1_trans1_refl2", "out1")?;
      group1.connect_nodes(g1_n1, "rear", g1_n2, "input1")?; group1.connect_nodes(g1_n1, "rear", g1_n2, "input1")?;
      let mut nested_group = NodeGroup::new(); let mut nested_group = NodeGroup::new();
      let nested_g_n1 = nested_group.add_node(OpticNode::new("TFP1_g_nested_1", Dummy)); let nested_g_n1 = nested_group.add_node(OpticNode::new("TFP1_g_nested_1", Dummy::default()));
      let nested_g_n2 = nested_group.add_node(OpticNode::new("TFP1_g_nested_2", Dummy)); let nested_g_n2 = nested_group.add_node(OpticNode::new("TFP1_g_nested_2", Dummy::default()));
      nested_group.expand_view(true); nested_group.expand_view(true);
      nested_group.connect_nodes(nested_g_n1, "rear", nested_g_n2, "front")?; nested_group.connect_nodes(nested_g_n1, "rear", nested_g_n2, "front")?;
      ...@@ -31,8 +31,8 @@ fn main() -> Result<(), OpossumError> { ...@@ -31,8 +31,8 @@ fn main() -> Result<(), OpossumError> {
      let mut group2: NodeGroup = NodeGroup::new(); let mut group2: NodeGroup = NodeGroup::new();
      group2.expand_view(true); group2.expand_view(true);
      let g2_n1 = group2.add_node(OpticNode::new("TFP1_g2", Dummy)); let g2_n1 = group2.add_node(OpticNode::new("TFP1_g2", Dummy::default()));
      let g2_n2 = group2.add_node(OpticNode::new("TFP2_g2", Dummy)); let g2_n2 = group2.add_node(OpticNode::new("TFP2_g2", Dummy::default()));
      group2.map_input_port(g2_n1, "front", "in1")?; group2.map_input_port(g2_n1, "front", "in1")?;
      group2.connect_nodes(g2_n1, "rear", g2_n2, "front")?; group2.connect_nodes(g2_n1, "rear", g2_n2, "front")?;
      ......
      examples/michaelson.rs
      + 3
      − 3
      View file @ 9a646174
      ...@@ -11,11 +11,11 @@ fn main() -> Result<(), OpossumError> { ...@@ -11,11 +11,11 @@ fn main() -> Result<(), OpossumError> {
      scenery.set_description("Michaelson interferomater"); scenery.set_description("Michaelson interferomater");
      let src = scenery.add_element("Source", Source::default()); let src = scenery.add_element("Source", Source::default());
      let bs = scenery.add_element("Beamspliiter", BeamSplitter::default()); let bs = scenery.add_element("Beamspliiter", BeamSplitter::default());
      let sample = scenery.add_element("sample", Dummy); let sample = scenery.add_element("sample", Dummy::default());
      let rf = NodeReference::from_node(scenery.node(sample)?); let rf = NodeReference::from_node(scenery.node(sample)?);
      let r_sample = scenery.add_node(rf); let r_sample = scenery.add_node(rf);
      let m1 = scenery.add_element("Mirror", Dummy); let m1 = scenery.add_element("Mirror", Dummy::default());
      let m2 = scenery.add_element("Mirror", Dummy); let m2 = scenery.add_element("Mirror", Dummy::default());
      let rf = NodeReference::from_node(scenery.node(bs)?); let rf = NodeReference::from_node(scenery.node(bs)?);
      let r_bs = scenery.add_node(rf); let r_bs = scenery.add_node(rf);
      let det = scenery.add_element("Detector", Detector::default()); let det = scenery.add_element("Detector", Detector::default());
      ......
      examples/opticscenery.rs
      + 2
      − 2
      View file @ 9a646174
      ...@@ -11,8 +11,8 @@ fn main() -> Result<(), OpossumError> { ...@@ -11,8 +11,8 @@ fn main() -> Result<(), OpossumError> {
      scenery.set_description("OpticScenery demo"); scenery.set_description("OpticScenery demo");
      println!("default opticscenery: {:?}", scenery); println!("default opticscenery: {:?}", scenery);
      println!("export to `dot` format: {}", scenery.to_dot()?); println!("export to `dot` format: {}", scenery.to_dot()?);
      let node1 = scenery.add_element("my optic", Dummy); let node1 = scenery.add_element("my optic", Dummy::default());
      let node2 = scenery.add_element("my other optic", Dummy); let node2 = scenery.add_element("my other optic", Dummy::default());
      scenery.connect_nodes(node1, "rear", node2, "front")?; scenery.connect_nodes(node1, "rear", node2, "front")?;
      let path = "graph.dot"; let path = "graph.dot";
      let mut output = File::create(path).unwrap(); let mut output = File::create(path).unwrap();
      ......
      examples/pa_doublepass_graph.rs
      + 3
      − 3
      View file @ 9a646174
      ...@@ -9,10 +9,10 @@ fn main() -> Result<(), OpossumError> { ...@@ -9,10 +9,10 @@ fn main() -> Result<(), OpossumError> {
      let mut scenery = OpticScenery::new(); let mut scenery = OpticScenery::new();
      scenery.set_description("PreAmp Doublepass section"); scenery.set_description("PreAmp Doublepass section");
      //let n0 = scenery.add_element("LightSource", Source::default()); //let n0 = scenery.add_element("LightSource", Source::default());
      let n1 = scenery.add_element("TFP", Dummy); let n1 = scenery.add_element("TFP", Dummy::default());
      let n2 = scenery.add_element("19mm amp", Dummy); let n2 = scenery.add_element("19mm amp", Dummy::default());
      //let n3 = scenery.add_element("Faraday", Dummy); //let n3 = scenery.add_element("Faraday", Dummy);
      let n4 = scenery.add_element("0° mirror", Dummy); let n4 = scenery.add_element("0° mirror", Dummy::default());
      let mut node = NodeReference::from_node(scenery.node(n1).unwrap()); let mut node = NodeReference::from_node(scenery.node(n1).unwrap());
      node.set_inverted(true); node.set_inverted(true);
      ......
      examples/uopa_graph.rs
      + 33
      − 33
      View file @ 9a646174
      ...@@ -14,13 +14,13 @@ fn main() -> Result<(), OpossumError> { ...@@ -14,13 +14,13 @@ fn main() -> Result<(), OpossumError> {
      println!("default opticscenery: {:?}", scenery); println!("default opticscenery: {:?}", scenery);
      println!("export to `dot` format: {}", scenery.to_dot()?); println!("export to `dot` format: {}", scenery.to_dot()?);
      let pulse_generation_split_node = scenery.add_element("Pulse Generation", Dummy); let pulse_generation_split_node = scenery.add_element("Pulse Generation", Dummy::default());
      let u_opa_1_node = scenery.add_element("uOPA Stage 1", Dummy); let u_opa_1_node = scenery.add_element("uOPA Stage 1", Dummy::default());
      let u_opa_2_node = scenery.add_element("uOPA Stage 2", Dummy); let u_opa_2_node = scenery.add_element("uOPA Stage 2", Dummy::default());
      let pump_pre_amplifier_node = scenery.add_element("Pump Pre-Amplifier", Dummy); let pump_pre_amplifier_node = scenery.add_element("Pump Pre-Amplifier", Dummy::default());
      let pump_main_amplifier_node = scenery.add_element("Pump Main-Amplifier", Dummy); let pump_main_amplifier_node = scenery.add_element("Pump Main-Amplifier", Dummy::default());
      let pump_compressor_node = scenery.add_element("Pump Compressor", Dummy); let pump_compressor_node = scenery.add_element("Pump Compressor", Dummy::default());
      let pump_shg_node = scenery.add_element("Pump SHG", Dummy); let pump_shg_node = scenery.add_element("Pump SHG", Dummy::default());
      let pump_splitter_node = scenery.add_element("Pump Beam Splitter", BeamSplitter::default()); let pump_splitter_node = scenery.add_element("Pump Beam Splitter", BeamSplitter::default());
      scenery.connect_nodes(pulse_generation_split_node, "rear", u_opa_1_node, "front")?; scenery.connect_nodes(pulse_generation_split_node, "rear", u_opa_1_node, "front")?;
      ...@@ -63,25 +63,25 @@ fn main() -> Result<(), OpossumError> { ...@@ -63,25 +63,25 @@ fn main() -> Result<(), OpossumError> {
      let mut scenery_2 = OpticScenery::new(); let mut scenery_2 = OpticScenery::new();
      scenery_2.set_description("PHELIX uOPA Pump Pre-Amplifier".into()); scenery_2.set_description("PHELIX uOPA Pump Pre-Amplifier".into());
      let spm_node = scenery_2.add_element("SPM", Dummy); let spm_node = scenery_2.add_element("SPM", Dummy::default());
      let circ1_node = scenery_2.add_element("Circulator Port 1", Dummy); let circ1_node = scenery_2.add_element("Circulator Port 1", Dummy::default());
      let circ2_node = scenery_2.add_element("Circulator Port 2", Dummy); let circ2_node = scenery_2.add_element("Circulator Port 2", Dummy::default());
      let circ3_node = scenery_2.add_element("Circulator Port 3", Dummy); let circ3_node = scenery_2.add_element("Circulator Port 3", Dummy::default());
      let cfbg_node = scenery_2.add_element("CFBG", Dummy); let cfbg_node = scenery_2.add_element("CFBG", Dummy::default());
      let isolator1_node = scenery_2.add_element("FI", Dummy); let isolator1_node = scenery_2.add_element("FI", Dummy::default());
      let tap1_node = scenery_2.add_element("Tap", Dummy); let tap1_node = scenery_2.add_element("Tap", Dummy::default());
      let diode1_node = scenery_2.add_element("Laser Diode", Dummy); let diode1_node = scenery_2.add_element("Laser Diode", Dummy::default());
      let wdm_node = scenery_2.add_element("WDM", Dummy); let wdm_node = scenery_2.add_element("WDM", Dummy::default());
      let yb_fiber1_node = scenery_2.add_element("Yb-Fiber 1", Dummy); let yb_fiber1_node = scenery_2.add_element("Yb-Fiber 1", Dummy::default());
      let tap2_node = scenery_2.add_element("Tap", Dummy); let tap2_node = scenery_2.add_element("Tap", Dummy::default());
      let aom_node = scenery_2.add_element("AOM", Dummy); let aom_node = scenery_2.add_element("AOM", Dummy::default());
      let isolator2_node = scenery_2.add_element("FI", Dummy); let isolator2_node = scenery_2.add_element("FI", Dummy::default());
      let yb_fiber2_node_node = scenery_2.add_element("Yb-Fiber 2", Dummy); let yb_fiber2_node_node = scenery_2.add_element("Yb-Fiber 2", Dummy::default());
      let dichroic_node = scenery_2.add_element("DCM", Dummy); let dichroic_node = scenery_2.add_element("DCM", Dummy::default());
      let diode2_node = scenery_2.add_element("Laser Diode", Dummy); let diode2_node = scenery_2.add_element("Laser Diode", Dummy::default());
      // let monitor1_node = scenery_2.add_element("Monitor", Dummy); // let monitor1_node = scenery_2.add_element("Monitor", Dummy);
      let monitor2_node = scenery_2.add_element("Monitor", Dummy); let monitor2_node = scenery_2.add_element("Monitor", Dummy::default());
      let monitor3_node = scenery_2.add_element("Monitor", Dummy); let monitor3_node = scenery_2.add_element("Monitor", Dummy::default());
      scenery_2.connect_nodes(spm_node, "rear", circ1_node, "front")?; scenery_2.connect_nodes(spm_node, "rear", circ1_node, "front")?;
      scenery_2.connect_nodes(circ1_node, "rear", circ2_node, "front")?; scenery_2.connect_nodes(circ1_node, "rear", circ2_node, "front")?;
      ...@@ -106,14 +106,14 @@ fn main() -> Result<(), OpossumError> { ...@@ -106,14 +106,14 @@ fn main() -> Result<(), OpossumError> {
      let mut scenery_3 = OpticScenery::new(); let mut scenery_3 = OpticScenery::new();
      scenery_3.set_description("PHELIX uOPA Pump Regenerative Main-Amplifier".into()); scenery_3.set_description("PHELIX uOPA Pump Regenerative Main-Amplifier".into());
      let _pol1_node = scenery_2.add_element("Picker Polarizer", Dummy); let _pol1_node = scenery_2.add_element("Picker Polarizer", Dummy::default());
      let _pc1_node = scenery_2.add_element("Pulse Picker PC", Dummy); let _pc1_node = scenery_2.add_element("Pulse Picker PC", Dummy::default());
      let _pol2_node = scenery_2.add_element("Cavity Polarizer", Dummy); let _pol2_node = scenery_2.add_element("Cavity Polarizer", Dummy::default());
      let _yb_yag_node = scenery_2.add_element("Yb:YAG", Dummy); let _yb_yag_node = scenery_2.add_element("Yb:YAG", Dummy::default());
      let _pc2_node = scenery_2.add_element("Cavity PC", Dummy); let _pc2_node = scenery_2.add_element("Cavity PC", Dummy::default());
      let _qwp_node = scenery_2.add_element("Quarter Waveplate", Dummy); let _qwp_node = scenery_2.add_element("Quarter Waveplate", Dummy::default());
      let _mirror1_node = scenery_2.add_element("Curved Mirror 1", Dummy); let _mirror1_node = scenery_2.add_element("Curved Mirror 1", Dummy::default());
      let _mirror2_node = scenery_2.add_element("Curved Mirror 1", Dummy); let _mirror2_node = scenery_2.add_element("Curved Mirror 1", Dummy::default());
      // scenery_2.connect_nodes(spm_node, circ_node); // scenery_2.connect_nodes(spm_node, circ_node);
      // let mira_node1 =scenery.add_node(OpticNode::new("Mira", Box::new(NodeDummy))); // let mira_node1 =scenery.add_node(OpticNode::new("Mira", Box::new(NodeDummy)));
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment

      https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy